Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db32e4e4 authored by Lance Richardson's avatar Lance Richardson Committed by David S. Miller
Browse files

ip6_gre: fix flowi6_proto value in ip6gre_xmit_other() 



Similar to commit 3be07244 ("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 252f3f5a ("ip6_gre: Set flowi6_proto as IPPROTO_GRE in xmit
path."), simply delete the line setting the incorrect flowi6_proto value.

Suggested-by: default avatarJiri Benc <jbenc@redhat.com>
Fixes: c12b395a ("gre: Support GRE over IPv6")
Reviewed-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: default avatarLance Richardson <lrichard@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 019b1c9f

net/ipv6/ip6_gre.c

+0 −1
Original line number Diff line number Diff line
@@ -648,7 +648,6 @@ static int ip6gre_xmit_other(struct sk_buff *skb, struct net_device *dev) 
		encap_limit = t->parms.encap_limit;



	memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));

	fl6.flowi6_proto = skb->protocol;



	err = gre_handle_offloads(skb, !!(t->parms.o_flags & TUNNEL_CSUM));

	if (err)