Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f693f19 authored by Haishuang Yan's avatar Haishuang Yan Committed by David S. Miller
Browse files

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: cfc7381b ("ip_tunnel: add collect_md mode to IPIP tunnel")
Cc: Alexei Starovoitov <ast@fb.com>
Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32a805ba

net/ipv4/ip_tunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -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++;