diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2017-09-07 08:08:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-09 05:47:10 +0200 |
| commit | 18e1173d5f3615c8c2680853ba87830ad8a0febc (patch) | |
| tree | b73c88cfa2082645a7f056e9603469bc0f96cb11 /net/ipv6 | |
| parent | ip_tunnel: fix setting ttl and tos value in collect_md mode (diff) | |
| download | linux-18e1173d5f3615c8c2680853ba87830ad8a0febc.tar.xz linux-18e1173d5f3615c8c2680853ba87830ad8a0febc.zip | |
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: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 3a0ba2ae4b0f..10a693a19323 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1184,6 +1184,7 @@ route_lookup: init_tel_txopt(&opt, encap_limit); 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 * needed_headroom if necessary. |