ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit
Subsystems (3)
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.
Signed-off-by Steffen Klassert <[email protected]>
--- net/ipv4/ip_gre.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
net/ipv4/ip_gre.c +1 -0
@@ -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
Quoted 5 lines · Steffen Klassert
Commit
5811662b15db018c740c57d037523683fd3e6123accidentally removed the setting ofIPPROTO_GREfrom the struct flowi inipgre_tunnel_xmit. This patch restores it.Signed-off-by Steffen Klassert <[email protected]>
Acked-by Changli Gao <[email protected]>
Signature · 2 lines
Regards, Changli Gao([email protected])
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Fri, 11 Feb 2011 10:30:40 +0100
Quoted 5 lines
Commit
5811662b15db018c740c57d037523683fd3e6123accidentally removed the setting ofIPPROTO_GREfrom the struct flowi inipgre_tunnel_xmit. This patch restores it.Signed-off-by Steffen Klassert <[email protected]>
Applied and queued up for -stable, thanks!