sctp: avoid irq lock inversion while call sk->sk_data_ready()

[safe/jmp/linux-2.6] / include / net / x25device.h

diff --git a/include/net/x25device.h b/include/net/x25device.h
index cf36a20..1415bcf 100644 (file)
--- 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);