From: Timo Teras <timo.teras@iki.fi>
Date: Fri, 11 Jan 2008 09:30:35 +0000 (-0800)
Subject: IPV4: ip_gre: set mac_header correctly in receive path
X-Git-Tag: v2.6.22.17~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=596bc9331ee5fa74fda7e276b5a001b789ae644c;p=thirdparty%2Fkernel%2Fstable.git

IPV4: ip_gre: set mac_header correctly in receive path

[IPV4] ip_gre: set mac_header correctly in receive path

[ Upstream commit: 1d0691674764098304ae4c63c715f5883b4d3784 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 63282934725e0..724b6123b5fdf 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);