ipv6: Don't reset inner headers in ip6_tnl_xmit
authorTom Herbert <tom@herbertland.com>
Wed, 18 May 2016 16:06:24 +0000 (09:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2016 22:03:17 +0000 (18:03 -0400)
Since iptunnel_handle_offloads() is called in all paths we can
probably drop the block in ip6_tnl_xmit that was checking for
skb->encapsulation and resetting the inner headers.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c

index 823dad1e631b2cef2e7c0b38ebc77e5d6989246c..7b0481e3738f20b672cac77a88617adbe8ecfbbf 100644 (file)
@@ -1120,11 +1120,6 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
                ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
        }
 
-       if (likely(!skb->encapsulation)) {
-               skb_reset_inner_headers(skb);
-               skb->encapsulation = 1;
-       }
-
        /* Calculate max headroom for all the headers and adjust
         * needed_headroom if necessary.
         */