diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-05-18 09:06:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-20 18:03:17 -0400 |
| commit | 3ee93eaf2bbfbe0083f71a18a265d48adbd5bb27 (patch) | |
| tree | 2676cf613cb92be36942e63bb7880b78432d6a59 | |
| parent | b8921ca83eed2496108ee308e9a41c5084089680 (diff) | |
| download | blackbird-op-linux-3ee93eaf2bbfbe0083f71a18a265d48adbd5bb27.tar.gz blackbird-op-linux-3ee93eaf2bbfbe0083f71a18a265d48adbd5bb27.zip | |
ipv6: Don't reset inner headers in ip6_tnl_xmit
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>
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 823dad1e631b..7b0481e3738f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -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. */ |
