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)
commitab34380162cbc9b5172afdadf5136643c687bb73
tree8f14b617a73b08d1485b6228bf39562fb22d6ccb
parentb44e108b6f322eb5f20aa6eba39b468a1ffc10ff
ipv6: Don't unset flowi6_proto in ipxip6_tnl_xmit()

Commit 8eb30be0352d0916 ("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: 8eb30be0352d ("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