summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2007-12-20 00:10:33 -0800
committerDavid S. Miller <davem@davemloft.net>2007-12-20 00:10:33 -0800
commit1d0691674764098304ae4c63c715f5883b4d3784 (patch)
tree37f3804b70ded513a0e8f1865bc64a6588354925 /net
parent5951cab136d8b7e84696061dc2e69c402bc94f61 (diff)
downloadlinux-1d0691674764098304ae4c63c715f5883b4d3784.tar.bz2
[IPV4] ip_gre: set mac_header correctly in receive path
mac_header update in ipgre_recv() was incorrectly changed to skb_reset_mac_header() when it was introduced. Signed-off-by: Timo Teras <timo.teras@iki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_gre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 02b02a8d681c..4b93f32de10d 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -613,7 +613,7 @@ static int ipgre_rcv(struct sk_buff *skb)
offset += 4;
}
- skb_reset_mac_header(skb);
+ skb->mac_header = skb->network_header;
__pskb_pull(skb, offset);
skb_reset_network_header(skb);
skb_postpull_rcsum(skb, skb_transport_header(skb), offset);