diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2017-09-07 14:08:34 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-08 20:47:10 -0700 |
| commit | 0f693f1995cf002432b70f43ce73f79bf8d0b6c9 (patch) | |
| tree | 37594300d55960ee4c7bd27a2149838bdb5b37c3 /net/ipv4 | |
| parent | 32a805baf0fb70b6dbedefcd7249ac7f580f9e3b (diff) | |
| download | linux-0f693f1995cf002432b70f43ce73f79bf8d0b6c9.tar.bz2 | |
ip_tunnel: fix setting ttl and tos value in collect_md mode
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>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 129d1a3616f8..e1856bfa753d 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++; |