* [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; 6+ 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 related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel
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 ` 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
2 siblings, 1 reply; 6+ 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
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>
---
net/ipv6/ip6_tunnel.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 3a0ba2a..10a693a 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1184,6 +1184,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
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.
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode
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 1:54 ` Alexei Starovoitov
2017-09-09 3:47 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Alexei Starovoitov @ 2017-09-09 1:54 UTC (permalink / raw)
To: Haishuang Yan, David S. Miller; +Cc: netdev, linux-kernel
On 9/6/17 11:08 PM, Haishuang Yan wrote:
> 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)));
indeed. good catch. thanks
Acked-by: Alexei Starovoitov <ast@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode
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 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
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-09-09 3:47 UTC (permalink / raw)
To: yanhaishuang; +Cc: kuznet, yoshfuji, netdev, linux-kernel, ast
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Thu, 7 Sep 2017 14:08:34 +0800
> 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>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel
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
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-09-09 3:48 UTC (permalink / raw)
To: yanhaishuang; +Cc: kuznet, yoshfuji, netdev, linux-kernel
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Thu, 7 Sep 2017 14:08:35 +0800
> 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>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel
2017-09-04 6:17 [PATCH v3] ip6_tunnel: Correct " Haishuang Yan
@ 2017-09-04 6:17 ` Haishuang Yan
0 siblings, 0 replies; 6+ messages in thread
From: Haishuang Yan @ 2017-09-04 6:17 UTC (permalink / raw)
To: David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI
Cc: netdev, linux-kernel, Haishuang Yan
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>
---
net/ipv6/ip6_tunnel.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 3a0ba2a..10a693a 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1184,6 +1184,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
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.
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-09 3:48 UTC | newest]
Thread overview: 6+ 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
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 6:17 [PATCH v3] ip6_tunnel: Correct " Haishuang Yan
2017-09-04 6:17 ` [PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel Haishuang Yan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.