From: Timo Teras <timo.teras@iki.fi>
Date: Thu, 20 Dec 2007 08:10:33 +0000 (-0800)
Subject: [IPV4] ip_gre: set mac_header correctly in receive path
X-Git-Tag: v2.6.24-rc7~54^2~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d0691674764098304ae4c63c715f5883b4d3784;p=linux-2.6

[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>
---

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 02b02a8d68..4b93f32de1 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);