ip6_gre: fix flowi6_proto value in ip6gre_xmit_other()
authorLance Richardson <lrichard@redhat.com>
Fri, 23 Sep 2016 19:50:29 +0000 (15:50 -0400)
committerDanny Wood <danwood76@gmail.com>
Tue, 29 Jan 2019 13:15:10 +0000 (13:15 +0000)
commit9ce19a2823ed8cbcf6934c87ae59a27c1fb8c691
treed250f3d15d954fdc2e86ef4f391189862493c47e
parentfc03c80a2d30dbd012cfb430e64e39c4da3ec1c8
ip6_gre: fix flowi6_proto value in ip6gre_xmit_other()

commit db32e4e49ce2b0e5fcc17803d011a401c0a637f6 upstream.

Similar to commit 3be07244b733 ("ip6_gre: fix flowi6_proto value in
xmit path"), set flowi6_proto to IPPROTO_GRE for output route lookup.

Up until now, ip6gre_xmit_other() has set flowi6_proto to a bogus value.
This affected output route lookup for packets sent on an ip6gretap device
in cases where routing was dependent on the value of flowi6_proto.

Since the correct proto is already set in the tunnel flowi6 template via
commit 252f3f5a1189 ("ip6_gre: Set flowi6_proto as IPPROTO_GRE in xmit
path."), simply delete the line setting the incorrect flowi6_proto value.

Suggested-by: Jiri Benc <jbenc@redhat.com>
Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
Reviewed-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: Lance Richardson <lrichard@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
net/ipv6/ip6_gre.c