commit e2d1bca7e6134671bcb19810d004a252aa6a644d
author Arnaldo Carvalho de Melo <acme@redhat.com> Tue Apr 10 20:46:21 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Wed Apr 25 22:24:47 2007 -0700
tree 5d8ee962cd69cd886aaedff8ac253590a985dd1c
parent c1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce

[SK_BUFF]: Use skb_reset_network_header in skb_push cases

skb_push updates and returns skb->data, so we can just call
skb_reset_network_header after the call to skb_push.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/ip_gre.c

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index ced2c4b..f84ca66 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -828,7 +828,8 @@
 	}
 
 	skb->h.raw = skb->nh.raw;
-	skb->nh.raw = skb_push(skb, gre_hlen);
+	skb_push(skb, gre_hlen);
+	skb_reset_network_header(skb);
 	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 	IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
 			      IPSKB_REROUTED);