Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee93eaf authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

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: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8921ca8

net/ipv6/ip6_tunnel.c

+0 −5
Original line number Diff line number Diff line
@@ -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.

	 */