{"id":809278,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809278/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504442982-12431-1-git-send-email-yanhaishuang@cmss.chinamobile.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504442982-12431-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","list_archive_url":null,"date":"2017-09-03T12:49:42","name":"geneve: Fix setting ttl value in collect metadata mode","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"9c06070fd0861a77b2d280ef1675a8f657238d00","submitter":{"id":68606,"url":"http://patchwork.ozlabs.org/api/1.2/people/68606/?format=json","name":"Haishuang Yan","email":"yanhaishuang@cmss.chinamobile.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504442982-12431-1-git-send-email-yanhaishuang@cmss.chinamobile.com/mbox/","series":[{"id":1227,"url":"http://patchwork.ozlabs.org/api/1.2/series/1227/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1227","date":"2017-09-03T12:49:42","name":"geneve: Fix setting ttl value in collect metadata mode","version":1,"mbox":"http://patchwork.ozlabs.org/series/1227/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809278/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809278/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 3xlXrJ6tGrz9s8J\n\tfor ;\n\tSun, 3 Sep 2017 22:50:08 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752913AbdICMty (ORCPT );\n\tSun, 3 Sep 2017 08:49:54 -0400","from cmccmta2.chinamobile.com ([221.176.66.80]:32774 \"EHLO\n\tcmccmta2.chinamobile.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752353AbdICMtw (ORCPT\n\t); Sun, 3 Sep 2017 08:49:52 -0400","from spf.mail.chinamobile.com (unknown[172.16.121.9]) by\n\trmmx-syy-dmz-app07-12007 (RichMail) with SMTP id\n\t2ee759abfa6c414-374e8; Sun, 03 Sep 2017 20:49:49 +0800 (CST)","from localhost (unknown[223.105.0.240])\n\tby rmsmtp-syy-appsvr05-12005 (RichMail) with SMTP id\n\t2ee559abfa6c2b4-24201; Sun, 03 Sep 2017 20:49:48 +0800 (CST)"],"X-RM-TRANSID":["2ee759abfa6c414-374e8","2ee559abfa6c2b4-24201"],"X-RM-SPAM-FLAG":"00000000","From":"Haishuang Yan ","To":"\"David S. Miller\" , pravin shelar ,\n\tGirish Moodalbail ","Cc":"netdev@vger.kernel.org, linux-kernel@vger.kernel.org,\n\tHaishuang Yan ","Subject":"[PATCH] geneve: Fix setting ttl value in collect metadata mode","Date":"Sun, 3 Sep 2017 20:49:42 +0800","Message-Id":"<1504442982-12431-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","X-Mailer":"git-send-email 1.8.3.1","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"If key->tos is zero in collect metadata mode, tos should fallback to\nip{4,6}_dst_hoplimit, same as normal mode.\n\nSigned-off-by: Haishuang Yan \n---\n drivers/net/geneve.c | 6 ++----\n 1 file changed, 2 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c\nindex f640407..d52a65f 100644\n--- a/drivers/net/geneve.c\n+++ b/drivers/net/geneve.c\n@@ -834,11 +834,10 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,\n \tsport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);\n \tif (geneve->collect_md) {\n \t\ttos = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);\n-\t\tttl = key->ttl;\n \t} else {\n \t\ttos = ip_tunnel_ecn_encap(fl4.flowi4_tos, ip_hdr(skb), skb);\n-\t\tttl = key->ttl ? : ip4_dst_hoplimit(&rt->dst);\n \t}\n+\tttl = key->ttl ? : ip4_dst_hoplimit(&rt->dst);\n \tdf = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;\n \n \terr = geneve_build_skb(&rt->dst, skb, info, xnet, sizeof(struct iphdr));\n@@ -873,12 +872,11 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,\n \tsport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);\n \tif (geneve->collect_md) {\n \t\tprio = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);\n-\t\tttl = key->ttl;\n \t} else {\n \t\tprio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel),\n \t\t\t\t\t ip_hdr(skb), skb);\n-\t\tttl = key->ttl ? : ip6_dst_hoplimit(dst);\n \t}\n+\tttl = key->ttl ? : ip6_dst_hoplimit(dst);\n \terr = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr));\n \tif (unlikely(err))\n \t\treturn err;\n","prefixes":[]}