diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:16:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:16:40 -0400 |
| commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
| tree | 4d4353bb6535aec7822ea71e594154979728e484 /include/net/x25device.h | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/x25device.h')
| -rw-r--r-- | include/net/x25device.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/x25device.h b/include/net/x25device.h index cf36a20ea3c5..d45ae883bd1d 100644 --- a/include/net/x25device.h +++ b/include/net/x25device.h | |||
| @@ -5,8 +5,7 @@ | |||
| 5 | #include <linux/if_packet.h> | 5 | #include <linux/if_packet.h> |
| 6 | #include <linux/skbuff.h> | 6 | #include <linux/skbuff.h> |
| 7 | 7 | ||
| 8 | static inline unsigned short x25_type_trans(struct sk_buff *skb, | 8 | static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev) |
| 9 | struct net_device *dev) | ||
| 10 | { | 9 | { |
| 11 | skb->mac.raw = skb->data; | 10 | skb->mac.raw = skb->data; |
| 12 | skb->input_dev = skb->dev = dev; | 11 | skb->input_dev = skb->dev = dev; |