From 4fc2808ca793e7ebd2ad3b2a47dc95d19350bd37 Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@iki.fi>
Date: Thu, 20 Dec 2007 00:10:33 -0800
Subject: [PATCH] --- yaml --- r: 75131 b: refs/heads/master c:
 1d0691674764098304ae4c63c715f5883b4d3784 h: refs/heads/master i:   75129:
 3a24d2aeb1b6fc64de1041f67c895d7d6d9a002a   75127:
 ed60416b0d31bf4abbd7c83c4f8823998dad09ba v: v3

---
 [refs]                  | 2 +-
 trunk/net/ipv4/ip_gre.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f6fec74611be..ef0d6ae218e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5951cab136d8b7e84696061dc2e69c402bc94f61
+refs/heads/master: 1d0691674764098304ae4c63c715f5883b4d3784
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index 02b02a8d681c..4b93f32de10d 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/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);