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 <>
Acked-by: default avatarChangli Gao <>
Signed-off-by: default avatarDavid S. Miller <>
parent 0b150932
......@@ -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)) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment