---

yaml --- r: 75131 b: refs/heads/master c: 1d06916 h: refs/heads/master i: 75129: 3a24d2a 75127: ed60416 v: v3
git-mirror · Dec 20, 2007 · 4fc2808 · 4fc2808
1 parent 7c64b6b
commit 4fc2808
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);