Revert: "ip6_tunnel: Update skb->protocol to ETH_P_IPV6 in ip6_tnl_xmit()"
authorEli Cooper <elicooper@gmx.com>
Thu, 1 Dec 2016 02:05:12 +0000 (10:05 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Dec 2016 17:34:22 +0000 (12:34 -0500)
commit80d1106aeaf689ab5fdf33020c5fecd269b31c88
tree9249c06176f0a2b30a484d28f2102225d0d16e32
parentb4e479a96fc398ccf83bb1cffb4ffef8631beaf1
Revert: "ip6_tunnel: Update skb->protocol to ETH_P_IPV6 in ip6_tnl_xmit()"

This reverts commit ae148b085876fa771d9ef2c05f85d4b4bf09ce0d
("ip6_tunnel: Update skb->protocol to ETH_P_IPV6 in ip6_tnl_xmit()").

skb->protocol is now set in __ip_local_out() and __ip6_local_out() before
dst_output() is called. It is no longer necessary to do it for each tunnel.

Cc: stable@vger.kernel.org
Signed-off-by: Eli Cooper <elicooper@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c