]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
ip6_tunnel: allow to inherit from VLAN encapsulated IP
authorMatthias May <matthias.may@westermo.com>
Mon, 11 Jul 2022 09:17:22 +0000 (11:17 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jul 2022 11:10:22 +0000 (12:10 +0100)
commitb09ab9c92e5077a00602dbff606ea518f379303c
treebeca8569b384c1846261dfacba85a2028914f7de
parent3f8a8447fd0b0069236a417607b2e6cba30911ac
ip6_tunnel: allow to inherit from VLAN encapsulated IP

The current code allows to inherit the TTL (hop_limit) from the
payload when skb->protocol is ETH_P_IP or ETH_P_IPV6.
However when the payload is VLAN encapsulated (e.g because the tunnel
is of type GRETAP), then this inheriting does not work, because the
visible skb->protocol is of type ETH_P_8021Q or ETH_P_8021AD.

Instead of skb->protocol, use skb_protocol().

Signed-off-by: Matthias May <matthias.may@westermo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c