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

Commit 18e1173d authored by Haishuang Yan's avatar Haishuang Yan Committed by David S. Miller
Browse files

ip6_tunnel: fix setting hop_limit value for ipv6 tunnel 



Similar to vxlan/geneve tunnel, if hop_limit is zero, it should fall
back to ip6_dst_hoplimt().

Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f693f19

net/ipv6/ip6_tunnel.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1184,6 +1184,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield, 
		init_tel_txopt(&opt, encap_limit);

		init_tel_txopt(&opt, encap_limit);

		ipv6_push_frag_opts(skb, &opt.ops, &proto);

		ipv6_push_frag_opts(skb, &opt.ops, &proto);

	}

	}

	hop_limit = hop_limit ? : ip6_dst_hoplimit(dst);





	/* Calculate max headroom for all the headers and adjust

	/* Calculate max headroom for all the headers and adjust

	 * needed_headroom if necessary.

	 * needed_headroom if necessary.