Subject: Re: [PATCH v3] ip6_tunnel: Correct tos value in collect_md mode

From: Peter Dawson <[email-masked]>
Date: Sun, 18 Jun 2017 21:06:00 +1000

On Sat, 17 Jun 2017 11:38:05 +0800
Haishuang Yan <[email-masked]> wrote:

> Same as ip_gre, geneve and vxlan, use key->tos as traffic class value.
> 
> CC: Peter Dawson <[email-masked]>
> Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
> encapsulated packets”)
> Signed-off-by: Haishuang Yan <[email-masked]>
> 
> ---
> 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 <[email-masked]>