summaryrefslogtreecommitdiffstats
path: root/net/netrom/nr_dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-12-20 09:25:54 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2007-12-20 09:25:54 +0100
commitc6e6ca712b5cc06a662f900c0484d49d7334af64 (patch)
tree2970917a32e2894a0dbb87fcb9f351baa0d8d125 /net/netrom/nr_dev.c
parent[IPV4] ip_gre: set mac_header correctly in receive path (diff)
downloadlinux-c6e6ca712b5cc06a662f900c0484d49d7334af64.tar.xz
linux-c6e6ca712b5cc06a662f900c0484d49d7334af64.zip
[NET]: Correct two mistaken skb_reset_mac_header() conversions.
This operation helper abstracts: skb->mac_header = skb->data; but it was done in two more places which were actually: skb->mac_header = skb->network_header; and those are corrected here. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/nr_dev.c')
-rw-r--r--net/netrom/nr_dev.c2
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)
/* Spoof incoming device */
skb->dev = dev;
- skb_reset_mac_header(skb);
+ skb->mac_header = skb->network_header;
skb_reset_network_header(skb);
skb->pkt_type = PACKET_HOST;