diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /include/net/x25device.h | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/net/x25device.h')
| -rw-r--r-- | include/net/x25device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/x25device.h b/include/net/x25device.h index 1a318374faef..1d10c879f7e2 100644 --- a/include/net/x25device.h +++ b/include/net/x25device.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev) | 8 | static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev) |
| 9 | { | 9 | { |
| 10 | skb->mac.raw = skb->data; | 10 | skb->mac.raw = skb->data; |
| 11 | skb->dev = dev; | ||
| 11 | skb->pkt_type = PACKET_HOST; | 12 | skb->pkt_type = PACKET_HOST; |
| 12 | 13 | ||
| 13 | return htons(ETH_P_X25); | 14 | return htons(ETH_P_X25); |