[SK_BUFF]: Use skb_reset_network_header where the return of __pskb_pull was being...

It returns skb->data, so we can just use skb_reset_network_header after it.

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

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f84ca6668fb90382309ac581a513d3b62226467c..7c6fda6fe8463d2f9470b98a5102620d33907eab 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -617,7 +617,8 @@ static int ipgre_rcv(struct sk_buff *skb)
                }
 
                skb_reset_mac_header(skb);
-               skb->nh.raw = __pskb_pull(skb, offset);
+               __pskb_pull(skb, offset);
+               skb_reset_network_header(skb);
                skb_postpull_rcsum(skb, skb->h.raw, offset);
                skb->pkt_type = PACKET_HOST;
 #ifdef CONFIG_NET_IPGRE_BROADCAST