{"id":810856,"url":"http://patchwork.ozlabs.org/api/patches/810856/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504764515-13536-2-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":"<1504764515-13536-2-git-send-email-yanhaishuang@cmss.chinamobile.com>","list_archive_url":null,"date":"2017-09-07T06:08:35","name":"[2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"a65ab06ca1959b6711948c4c0b22251c66d25f82","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/1504764515-13536-2-git-send-email-yanhaishuang@cmss.chinamobile.com/mbox/","series":[{"id":1912,"url":"http://patchwork.ozlabs.org/api/series/1912/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1912","date":"2017-09-07T06:08:35","name":"[1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode","version":1,"mbox":"http://patchwork.ozlabs.org/series/1912/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810856/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810856/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 3xnqlt6k15z9sRV\n\tfor ;\n\tThu, 7 Sep 2017 16:09:14 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754061AbdIGGI7 (ORCPT );\n\tThu, 7 Sep 2017 02:08:59 -0400","from cmccmta3.chinamobile.com ([221.176.66.81]:20166 \"EHLO\n\tcmccmta3.chinamobile.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1753437AbdIGGI4 (ORCPT\n\t); Thu, 7 Sep 2017 02:08:56 -0400","from spf.mail.chinamobile.com (unknown[172.16.121.3]) by\n\trmmx-syy-dmz-app12-12012 (RichMail) with SMTP id\n\t2eec59b0e2764d7-9c5f8; Thu, 07 Sep 2017 14:08:54 +0800 (CST)","from localhost (unknown[223.105.0.240])\n\tby rmsmtp-syy-appsvr02-12002 (RichMail) with SMTP id\n\t2ee259b0e275632-19024; Thu, 07 Sep 2017 14:08:53 +0800 (CST)"],"X-RM-TRANSID":["2eec59b0e2764d7-9c5f8","2ee259b0e275632-19024"],"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 ","Subject":"[PATCH 2/2] ip6_tunnel: fix setting hop_limit value for ipv6 tunnel","Date":"Thu, 7 Sep 2017 14:08:35 +0800","Message-Id":"<1504764515-13536-2-git-send-email-yanhaishuang@cmss.chinamobile.com>","X-Mailer":"git-send-email 1.8.3.1","In-Reply-To":"<1504764515-13536-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","References":"<1504764515-13536-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Similar to vxlan/geneve tunnel, if hop_limit is zero, it should fall\nback to ip6_dst_hoplimt().\n\nSigned-off-by: Haishuang Yan \n---\n net/ipv6/ip6_tunnel.c | 1 +\n 1 file changed, 1 insertion(+)","diff":"diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c\nindex 3a0ba2a..10a693a 100644\n--- a/net/ipv6/ip6_tunnel.c\n+++ b/net/ipv6/ip6_tunnel.c\n@@ -1184,6 +1184,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,\n \t\tinit_tel_txopt(&opt, encap_limit);\n \t\tipv6_push_frag_opts(skb, &opt.ops, &proto);\n \t}\n+\thop_limit = hop_limit ? : ip6_dst_hoplimit(dst);\n \n \t/* Calculate max headroom for all the headers and adjust\n \t * needed_headroom if necessary.\n","prefixes":["2/2"]}