]> git.baikalelectronics.ru Git - kernel.git/commit
ipv6: Don't unset flowi6_proto in ipxip6_tnl_xmit()
authorEli Cooper <elicooper@gmx.com>
Fri, 26 Aug 2016 15:52:29 +0000 (23:52 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Sep 2016 06:41:24 +0000 (23:41 -0700)
commite2d12e3246c4d27eb093f47ddfff8e6a11559444
tree8f14b617a73b08d1485b6228bf39562fb22d6ccb
parentd3c1e4ebad033a97e20f882f637e8bd3a99f3a2c
ipv6: Don't unset flowi6_proto in ipxip6_tnl_xmit()

Commit 4aa2a9ede7de74f3 ("ipv6: Create ip6_tnl_xmit") unsets
flowi6_proto in ip4ip6_tnl_xmit() and ip6ip6_tnl_xmit().
Since xfrm_selector_match() relies on this info, IPv6 packets
sent by an ip6tunnel cannot be properly selected by their
protocols after removing it. This patch puts flowi6_proto back.

Cc: stable@vger.kernel.org
Fixes: 4aa2a9ede7de ("ipv6: Create ip6_tnl_xmit")
Signed-off-by: Eli Cooper <elicooper@gmx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c