* [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode
@ 2017-06-17 3:38 Haishuang Yan
2017-06-18 11:06 ` Peter Dawson
2017-06-19 3:57 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Haishuang Yan @ 2017-06-17 3:38 UTC (permalink / raw)
To: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
Daniel Borkmann
Cc: netdev, linux-kernel, Haishuang Yan, Peter Dawson
Same as ip_gre, geneve and vxlan, use key->tos as traffic class value.
CC: Peter Dawson <petedaws@gmail.com>
Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
encapsulated packets”)
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
Changes since v3:
* Add fixes information
* Remove obsoleted RT_TOS mask
---
net/ipv6/ip6_tunnel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ef99d59..9d65918 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
fl6.flowi6_proto = IPPROTO_IPIP;
fl6.daddr = key->u.ipv6.dst;
fl6.flowlabel = key->label;
- dsfield = ip6_tclass(key->label);
+ dsfield = key->tos;
} else {
if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
encap_limit = t->parms.encap_limit;
@@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
fl6.flowi6_proto = IPPROTO_IPV6;
fl6.daddr = key->u.ipv6.dst;
fl6.flowlabel = key->label;
- dsfield = ip6_tclass(key->label);
+ dsfield = key->tos;
} else {
offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode
2017-06-17 3:38 [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode Haishuang Yan
@ 2017-06-18 11:06 ` Peter Dawson
2017-06-19 3:57 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Peter Dawson @ 2017-06-18 11:06 UTC (permalink / raw)
To: Haishuang Yan
Cc: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
Daniel Borkmann, netdev, linux-kernel
On Sat, 17 Jun 2017 11:38:05 +0800
Haishuang Yan <yanhaishuang@cmss.chinamobile.com> wrote:
> Same as ip_gre, geneve and vxlan, use key->tos as traffic class value.
>
> CC: Peter Dawson <petedaws@gmail.com>
> Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
> encapsulated packets”)
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
>
> ---
> Changes since v3:
> * Add fixes information
> * Remove obsoleted RT_TOS mask
> ---
> net/ipv6/ip6_tunnel.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index ef99d59..9d65918 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
> fl6.flowi6_proto = IPPROTO_IPIP;
> fl6.daddr = key->u.ipv6.dst;
> fl6.flowlabel = key->label;
> - dsfield = ip6_tclass(key->label);
> + dsfield = key->tos;
> } else {
> if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
> encap_limit = t->parms.encap_limit;
> @@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
> fl6.flowi6_proto = IPPROTO_IPV6;
> fl6.daddr = key->u.ipv6.dst;
> fl6.flowlabel = key->label;
> - dsfield = ip6_tclass(key->label);
> + dsfield = key->tos;
> } else {
> offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
> /* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
Acked-by: Peter Dawson <peter.a.dawson@boeing.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode
2017-06-17 3:38 [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode Haishuang Yan
2017-06-18 11:06 ` Peter Dawson
@ 2017-06-19 3:57 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2017-06-19 3:57 UTC (permalink / raw)
To: yanhaishuang
Cc: kuznet, jmorris, kaber, daniel, netdev, linux-kernel, petedaws
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Sat, 17 Jun 2017 11:38:05 +0800
> Same as ip_gre, geneve and vxlan, use key->tos as traffic class value.
>
> CC: Peter Dawson <petedaws@gmail.com>
> Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
> encapsulated packets”)
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
>
> ---
> Changes since v3:
> * Add fixes information
> * Remove obsoleted RT_TOS mask
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode
@ 2017-09-04 6:17 Haishuang Yan
0 siblings, 0 replies; 4+ 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, Peter Dawson
Same as ip_gre, geneve and vxlan, use key->tos as traffic class value.
CC: Peter Dawson <petedaws@gmail.com>
Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
encapsulated packets”)
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
Changes since v3:
* Add fixes information
* Remove obsoleted RT_TOS mask
---
net/ipv6/ip6_tunnel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ef99d59..9d65918 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
fl6.flowi6_proto = IPPROTO_IPIP;
fl6.daddr = key->u.ipv6.dst;
fl6.flowlabel = key->label;
- dsfield = ip6_tclass(key->label);
+ dsfield = key->tos;
} else {
if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
encap_limit = t->parms.encap_limit;
@@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
fl6.flowi6_proto = IPPROTO_IPV6;
fl6.daddr = key->u.ipv6.dst;
fl6.flowlabel = key->label;
- dsfield = ip6_tclass(key->label);
+ dsfield = key->tos;
} else {
offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-04 6:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-17 3:38 [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode Haishuang Yan
2017-06-18 11:06 ` Peter Dawson
2017-06-19 3:57 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 6:17 Haishuang Yan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).