* [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit
@ 2011-02-11 9:30 Steffen Klassert
2011-02-11 10:44 ` Changli Gao
2011-02-11 19:23 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Steffen Klassert @ 2011-02-11 9:30 UTC (permalink / raw)
To: David Miller; +Cc: Changli Gao, netdev
Commit 5811662b15db018c740c57d037523683fd3e6123 accidentally
removed the setting of IPPROTO_GRE from the struct flowi
in ipgre_tunnel_xmit. This patch restores it.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv4/ip_gre.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index eb68a0e..6613edf 100644
--- a/net/ipv4/ip_gre.c
+++ b/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)) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit
2011-02-11 9:30 [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit Steffen Klassert
@ 2011-02-11 10:44 ` Changli Gao
2011-02-11 19:23 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Changli Gao @ 2011-02-11 10:44 UTC (permalink / raw)
To: Steffen Klassert; +Cc: David Miller, netdev
On Fri, Feb 11, 2011 at 5:30 PM, Steffen Klassert
<steffen.klassert@secunet.com> wrote:
> Commit 5811662b15db018c740c57d037523683fd3e6123 accidentally
> removed the setting of IPPROTO_GRE from the struct flowi
> in ipgre_tunnel_xmit. This patch restores it.
>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Changli Gao <xiaosuo@gmail.com>
--
Regards,
Changli Gao(xiaosuo@gmail.com)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit
2011-02-11 9:30 [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit Steffen Klassert
2011-02-11 10:44 ` Changli Gao
@ 2011-02-11 19:23 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2011-02-11 19:23 UTC (permalink / raw)
To: steffen.klassert; +Cc: xiaosuo, netdev
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Fri, 11 Feb 2011 10:30:40 +0100
> Commit 5811662b15db018c740c57d037523683fd3e6123 accidentally
> removed the setting of IPPROTO_GRE from the struct flowi
> in ipgre_tunnel_xmit. This patch restores it.
>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Applied and queued up for -stable, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-11 19:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-11 9:30 [PATCH] ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit Steffen Klassert
2011-02-11 10:44 ` Changli Gao
2011-02-11 19:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).