X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Fx25device.h;fp=include%2Fnet%2Fx25device.h;h=1d10c879f7e241b8543e0f86cb51d45e56381982;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=cf36a20ea3c523459485e92d469366504541599e;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/include/net/x25device.h b/include/net/x25device.h
index cf36a20ea..1d10c879f 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->pkt_type = PACKET_HOST;
 	
 	return htons(ETH_P_X25);