From 8ecf5dc16085f6a6c7931e8f28795f4667a836fc Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Fri, 11 Feb 2011 11:21:57 -0800
Subject: [PATCH] --- yaml --- r: 233416 b: refs/heads/master c:
 946bf5ee3c46f73b5cbd52aab594697b1a132d1f h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/ipv4/ip_gre.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 10ad396f1ea5..7f1c6c5247c6 100644
--- 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
index eb68a0e34e49..6613edfac28c 100644
--- 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)) {