---

yaml --- r: 233416 b: refs/heads/master c: 946bf5e h: refs/heads/master v: v3
git-mirror · Feb 11, 2011 · 8ecf5dc · 8ecf5dc
1 parent 114c29c
commit 8ecf5dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b150932197b185ad5816932912e648116c7a96a
+refs/heads/master: 946bf5ee3c46f73b5cbd52aab594697b1a132d1f
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -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)) {