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

Commit 3be07244 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ip6_gre: fix flowi6_proto value in xmit path 



In xmit path, we build a flowi6 which will be used for the output route lookup.
We are sending a GRE packet, neither IPv4 nor IPv6 encapsulated packet, thus the
protocol should be IPPROTO_GRE.

Fixes: c12b395a ("gre: Support GRE over IPv6")
Reported-by: default avatarMatthieu Ternisien d'Ouville <matthieu.tdo@6wind.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea6a7112

net/ipv6/ip6_gre.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static inline int ip6gre_xmit_ipv4(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 = IPPROTO_IPIP;

	fl6.flowi6_proto = IPPROTO_GRE;



	dsfield = ipv4_get_dsfield(iph);
@@ -832,7 +832,7 @@ static inline int ip6gre_xmit_ipv6(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 = IPPROTO_IPV6;

	fl6.flowi6_proto = IPPROTO_GRE;



	dsfield = ipv6_get_dsfield(ipv6h);

	if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)