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

Commit 80d1106a authored by Eli Cooper's avatar Eli Cooper Committed by David S. Miller
Browse files

Revert: "ip6_tunnel: Update skb->protocol to ETH_P_IPV6 in ip6_tnl_xmit()" 



This reverts commit ae148b08
("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: default avatarEli Cooper <elicooper@gmx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4e479a9

net/ipv6/ip6_tunnel.c

+0 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,6 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield, 
	if (err)

		return err;



	skb->protocol = htons(ETH_P_IPV6);

	skb_push(skb, sizeof(struct ipv6hdr));

	skb_reset_network_header(skb);

	ipv6h = ipv6_hdr(skb);