diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
| commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
| tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /include/net/x25device.h | |
| parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/net/x25device.h')
| -rw-r--r-- | include/net/x25device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/x25device.h b/include/net/x25device.h index d45ae883bd1d..1a318374faef 100644 --- a/include/net/x25device.h +++ b/include/net/x25device.h | |||
| @@ -8,7 +8,6 @@ | |||
| 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->input_dev = skb->dev = dev; | ||
| 12 | skb->pkt_type = PACKET_HOST; | 11 | skb->pkt_type = PACKET_HOST; |
| 13 | 12 | ||
| 14 | return htons(ETH_P_X25); | 13 | return htons(ETH_P_X25); |