This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / wan / hdlc_x25.c

diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index 07e5eef..5231063 100644 (file)
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -23,8 +23,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/hdlc.h>
 
-#include <net/x25device.h>
-
 /* These functions are callbacks called by LAPB layer */
 
 static void x25_connect_disconnect(struct net_device *dev, int reason, int code)
@@ -40,7 +38,11 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code)
        ptr = skb_put(skb, 1);
        *ptr = code;
 
-       skb->protocol = x25_type_trans(skb, dev);
+       skb->dev = dev;
+       skb->protocol = htons(ETH_P_X25);
+       skb->mac.raw = skb->data;
+       skb->pkt_type = PACKET_HOST;
+
        netif_rx(skb);
 }
 
@@ -72,7 +74,11 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)
        ptr  = skb->data;
        *ptr = 0;
 
-       skb->protocol = x25_type_trans(skb, dev);
+       skb->dev = dev;
+       skb->protocol = htons(ETH_P_X25);
+       skb->mac.raw = skb->data;
+       skb->pkt_type = PACKET_HOST;
+
        return netif_rx(skb);
 }