mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode
@ 2017-09-07  6:08 Haishuang Yan
  2017-09-07  6:08 ` [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel Haishuang Yan
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Haishuang Yan @ 2017-09-07  6:08 UTC (permalink / raw)
  To: David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI
  Cc: netdev, linux-kernel, Haishuang Yan, Alexei Starovoitov

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-09-09  3:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-07  6:08 [PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode Haishuang Yan
2017-09-07  6:08 ` [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel Haishuang Yan
2017-09-09  3:48   ` David Miller
2017-09-09  1:54 ` [PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode Alexei Starovoitov
2017-09-09  3:47 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®