diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /net/netrom/nr_dev.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/netrom/nr_dev.c')
| -rw-r--r-- | net/netrom/nr_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 8c68da5ef0a1..6caf459665f2 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
| @@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
| 56 | 56 | ||
| 57 | /* Spoof incoming device */ | 57 | /* Spoof incoming device */ |
| 58 | skb->dev = dev; | 58 | skb->dev = dev; |
| 59 | skb_reset_mac_header(skb); | 59 | skb->mac_header = skb->network_header; |
| 60 | skb_reset_network_header(skb); | 60 | skb_reset_network_header(skb); |
| 61 | skb->pkt_type = PACKET_HOST; | 61 | skb->pkt_type = PACKET_HOST; |
| 62 | 62 | ||