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

Commit 946bf5ee authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit 



Commit 5811662b ("net: use the macros
defined for the members of flowi") accidentally removed the setting of
IPPROTO_GRE from the struct flowi in ipgre_tunnel_xmit. This patch
restores it.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Acked-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b150932

net/ipv4/ip_gre.c

+1 −0
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev 
			.fl4_dst = dst,

			.fl4_src = tiph->saddr,

			.fl4_tos = RT_TOS(tos),

			.proto = IPPROTO_GRE,

			.fl_gre_key = tunnel->parms.o_key

		};

		if (ip_route_output_key(dev_net(dev), &rt, &fl)) {