[SK_BUFF]: Introduce skb_reset_network_header(skb)

[mirror_ubuntu-zesty-kernel.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 9b561e633b007b7eaa122dc96f18f02ac85d0e99..5f886c892861e84214b331a6d48a9b86d3a10b2f 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -96,7 +96,6 @@
 #include <linux/capability.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/sched.h>
 #include <linux/kernel.h>
 #include <asm/uaccess.h>
 #include <linux/skbuff.h>
@@ -406,7 +405,7 @@ out:
        dst_release(skb2->dst);
        skb2->dst = NULL;
        skb_pull(skb2, skb->data - (u8*)eiph);
-       skb2->nh.raw = skb2->data;
+       skb_reset_network_header(skb2);
 
        /* Try to guess incoming interface */
        memset(&fl, 0, sizeof(fl));
@@ -488,7 +487,7 @@ static int ipip_rcv(struct sk_buff *skb)
                secpath_reset(skb);
 
                skb->mac.raw = skb->nh.raw;
-               skb->nh.raw = skb->data;
+               skb_reset_network_header(skb);
                skb->protocol = htons(ETH_P_IP);
                skb->pkt_type = PACKET_HOST;