Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1727929

[PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode

Show all headers | View raw

ttl and tos variables are declared and assigned, but are not used in
iptunnel_xmit() function.

Fixes: cfc7381b3002 ("ip_tunnel: add collect_md mode to IPIP tunnel")
Cc: Alexei Starovoitov <ast@fb.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
 net/ipv4/ip_tunnel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 129d1a3..e1856bf 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -618,8 +618,8 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto)
 		ip_rt_put(rt);
 		goto tx_dropped;
 	}
-	iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, proto, key->tos,
-		      key->ttl, df, !net_eq(tunnel->net, dev_net(dev)));
+	iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, proto, tos, ttl,
+		      df, !net_eq(tunnel->net, dev_net(dev)));
 	return;
 tx_error:
 	dev->stats.tx_errors++;
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-09-07 08:10 +0200
  [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-09-07 08:10 +0200
    Re: [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6  tunnel David Miller <davem@davemloft.net> - 2017-09-09 05:50 +0200
  Re: [PATCH 1/2] ip_tunnel: fix setting ttl and tos value in  collect_md mode David Miller <davem@davemloft.net> - 2017-09-09 05:50 +0200

csiph-web