| Message ID | 20110211093040.GB29583@secunet.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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>
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! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)) {
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(-)