X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fnet%2Fx25device.h;h=1415bcf93980f9c06aca48ee41de41065d72cedb;hb=f1dd9c379cac7d5a76259e7dffcd5f8edc697d17;hp=cf36a20ea3c523459485e92d469366504541599e;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/net/x25device.h b/include/net/x25device.h
index cf36a20..1415bcf 100644
--- a/include/net/x25device.h
+++ b/include/net/x25device.h
@@ -5,11 +5,10 @@
 #include <linux/if_packet.h>
 #include <linux/skbuff.h>
 
-static inline unsigned short x25_type_trans(struct sk_buff *skb,
-					    struct net_device *dev)
+static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
-	skb->mac.raw = skb->data;
-	skb->input_dev = skb->dev = dev;
+	skb->dev = dev;
+	skb_reset_mac_header(skb);
 	skb->pkt_type = PACKET_HOST;
 	
 	return htons(ETH_P_X25);