{"id":809526,"url":"http://patchwork.ozlabs.org/api/patches/809526/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504505848-3331-1-git-send-email-yanhaishuang@cmss.chinamobile.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504505848-3331-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","list_archive_url":null,"date":"2017-09-04T06:17:27","name":"[v3] ip6_tunnel: Correct tos value in collect_md mode","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"ea0ee2503e82bd6952fa0b7123b647b7cb5d460a","submitter":{"id":68606,"url":"http://patchwork.ozlabs.org/api/people/68606/?format=json","name":"Haishuang Yan","email":"yanhaishuang@cmss.chinamobile.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504505848-3331-1-git-send-email-yanhaishuang@cmss.chinamobile.com/mbox/","series":[{"id":1312,"url":"http://patchwork.ozlabs.org/api/series/1312/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1312","date":"2017-09-04T06:17:27","name":"[v3] ip6_tunnel: Correct tos value in collect_md mode","version":3,"mbox":"http://patchwork.ozlabs.org/series/1312/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809526/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809526/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xm05b01Rsz9s7c\n\tfor ;\n\tMon, 4 Sep 2017 16:18:11 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751628AbdIDGRl (ORCPT );\n\tMon, 4 Sep 2017 02:17:41 -0400","from cmccmta3.chinamobile.com ([221.176.66.81]:19291 \"EHLO\n\tcmccmta3.chinamobile.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750782AbdIDGRj (ORCPT\n\t); Mon, 4 Sep 2017 02:17:39 -0400","from spf.mail.chinamobile.com (unknown[172.16.121.13]) by\n\trmmx-syy-dmz-app10-12010 (RichMail) with SMTP id\n\t2eea59acf00044e-472eb; Mon, 04 Sep 2017 14:17:36 +0800 (CST)","from localhost (unknown[223.105.0.240])\n\tby rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id\n\t2ee759acefff07a-3c1aa; Mon, 04 Sep 2017 14:17:36 +0800 (CST)"],"X-RM-TRANSID":["2eea59acf00044e-472eb","2ee759acefff07a-3c1aa"],"X-RM-SPAM-FLAG":"00000000","From":"Haishuang Yan ","To":"\"David S. Miller\" ,\n\tAlexey Kuznetsov ,\n\tHideaki YOSHIFUJI ","Cc":"netdev@vger.kernel.org, linux-kernel@vger.kernel.org,\n\tHaishuang Yan ,\n\tPeter Dawson ","Subject":"[PATCH v3] ip6_tunnel: Correct tos value in collect_md mode","Date":"Mon, 4 Sep 2017 14:17:27 +0800","Message-Id":"<1504505848-3331-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","X-Mailer":"git-send-email 1.8.3.1","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Same as ip_gre, geneve and vxlan, use key->tos as traffic class value.\n\nCC: Peter Dawson \nFixes: 0e9a709560db (\"ip6_tunnel, ip6_gre: fix setting of DSCP on\nencapsulated packets”)\nSigned-off-by: Haishuang Yan \n\n---\nChanges since v3:\n * Add fixes information\n * Remove obsoleted RT_TOS mask\n---\n net/ipv6/ip6_tunnel.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c\nindex ef99d59..9d65918 100644\n--- a/net/ipv6/ip6_tunnel.c\n+++ b/net/ipv6/ip6_tunnel.c\n@@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,\n \t\tfl6.flowi6_proto = IPPROTO_IPIP;\n \t\tfl6.daddr = key->u.ipv6.dst;\n \t\tfl6.flowlabel = key->label;\n-\t\tdsfield = ip6_tclass(key->label);\n+\t\tdsfield = key->tos;\n \t} else {\n \t\tif (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))\n \t\t\tencap_limit = t->parms.encap_limit;\n@@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,\n \t\tfl6.flowi6_proto = IPPROTO_IPV6;\n \t\tfl6.daddr = key->u.ipv6.dst;\n \t\tfl6.flowlabel = key->label;\n-\t\tdsfield = ip6_tclass(key->label);\n+\t\tdsfield = key->tos;\n \t} else {\n \t\toffset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));\n \t\t/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */\n","prefixes":["v3"]}