diff options
| author | Eli Cooper <elicooper@gmx.com> | 2016-12-01 03:05:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-02 18:34:22 +0100 |
| commit | 80d1106aeaf689ab5fdf33020c5fecd269b31c88 (patch) | |
| tree | 9249c06176f0a2b30a484d28f2102225d0d16e32 /net | |
| parent | ipv6: Set skb->protocol properly for local output (diff) | |
| download | linux-80d1106aeaf689ab5fdf33020c5fecd269b31c88.tar.xz linux-80d1106aeaf689ab5fdf33020c5fecd269b31c88.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 0a4759b89da2..d76674efe523 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1181,7 +1181,6 @@ route_lookup: 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); |