X25: Use identifiers for hdlc x25 device to x25 interface
authorandrew hendry <andrew.hendry@gmail.com>
Mon, 19 Apr 2010 13:30:24 +0000 (13:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Apr 2010 23:12:51 +0000 (16:12 -0700)
Change magic numbers to identifiers for X25 interface.

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/hdlc_x25.c

index c7adbb79f7cc34daf5c1b13f1398ff654d143b33..70527e5a54a2a83f130fcff2eb2f934cce2b59d7 100644 (file)
@@ -49,14 +49,14 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code)
 
 static void x25_connected(struct net_device *dev, int reason)
 {
-       x25_connect_disconnect(dev, reason, 1);
+       x25_connect_disconnect(dev, reason, X25_IFACE_CONNECT);
 }
 
 
 
 static void x25_disconnected(struct net_device *dev, int reason)
 {
-       x25_connect_disconnect(dev, reason, 2);
+       x25_connect_disconnect(dev, reason, X25_IFACE_DISCONNECT);
 }
 
 
@@ -71,7 +71,7 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)
                return NET_RX_DROP;
 
        ptr  = skb->data;
-       *ptr = 0;
+       *ptr = X25_IFACE_DATA;
 
        skb->protocol = x25_type_trans(skb, dev);
        return netif_rx(skb);
@@ -94,13 +94,13 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
 
        /* X.25 to LAPB */
        switch (skb->data[0]) {
-       case 0:         /* Data to be transmitted */
+       case X25_IFACE_DATA:    /* Data to be transmitted */
                skb_pull(skb, 1);
                if ((result = lapb_data_request(dev, skb)) != LAPB_OK)
                        dev_kfree_skb(skb);
                return NETDEV_TX_OK;
 
-       case 1:
+       case X25_IFACE_CONNECT:
                if ((result = lapb_connect_request(dev))!= LAPB_OK) {
                        if (result == LAPB_CONNECTED)
                                /* Send connect confirm. msg to level 3 */
@@ -112,7 +112,7 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
                }
                break;
 
-       case 2:
+       case X25_IFACE_DISCONNECT:
                if ((result = lapb_disconnect_request(dev)) != LAPB_OK) {
                        if (result == LAPB_NOTCONNECTED)
                                /* Send disconnect confirm. msg to level 3 */