X25: remove duplicated #include

[net-next-2.6.git] / drivers / net / wan / x25_asy.c

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 80d5c5834a0bf976c0446a02e7a3050823158c4a..e47f5a986b1c213c7f14e43b38dda541504c8b7d 100644 (file)
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -29,15 +29,13 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
-#include <linux/x25.h>
 #include <linux/lapb.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/compat.h>
 #include <linux/slab.h>
-#include "x25_asy.h"
-
 #include <net/x25device.h>
+#include "x25_asy.h"
 
 static struct net_device **x25_asy_devs;
 static int x25_asy_maxdev = SL_NRUNIT;
@@ -315,15 +313,15 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
        }
 
        switch (skb->data[0]) {
-       case 0x00:
+       case X25_IFACE_DATA:
                break;
-       case 0x01: /* Connection request .. do nothing */
+       case X25_IFACE_CONNECT: /* Connection request .. do nothing */
                err = lapb_connect_request(dev);
                if (err != LAPB_OK)
                        printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err);
                kfree_skb(skb);
                return NETDEV_TX_OK;
-       case 0x02: /* Disconnect request .. do nothing - hang up ?? */
+       case X25_IFACE_DISCONNECT: /* do nothing - hang up ?? */
                err = lapb_disconnect_request(dev);
                if (err != LAPB_OK)
                        printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err);
@@ -411,7 +409,7 @@ static void x25_asy_connected(struct net_device *dev, int reason)
        }
 
        ptr  = skb_put(skb, 1);
-       *ptr = 0x01;
+       *ptr = X25_IFACE_CONNECT;
 
        skb->protocol = x25_type_trans(skb, sl->dev);
        netif_rx(skb);
@@ -430,7 +428,7 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
        }
 
        ptr  = skb_put(skb, 1);
-       *ptr = 0x02;
+       *ptr = X25_IFACE_DISCONNECT;
 
        skb->protocol = x25_type_trans(skb, sl->dev);
        netif_rx(skb);