diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/net/x25device.h | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-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; |