Skip to contentSkip to conversation

ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit

PATCH In review Steffen Klassert 3 participants 3 messages Feb 11, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit

Commit 5811662b15db018c740c57d037523683fd3e6123 accidentally removed the setting of IPPROTO_GRE from the struct flowi in ipgre_tunnel_xmit. This patch restores it.

---
 net/ipv4/ip_gre.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/ipv4/ip_gre.c +1 -0
index eb68a0e..6613edf 100644
@@ -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)) {
Signature · 1 line
1.7.0.4