{"id":810857,"url":"http://patchwork.ozlabs.org/api/patches/810857/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504764515-13536-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":"<1504764515-13536-1-git-send-email-yanhaishuang@cmss.chinamobile.com>","list_archive_url":null,"date":"2017-09-07T06:08:34","name":"[1/2] ip_tunnel: fix setting ttl and tos value in collect_md mode","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"277e314318b91f55030a2cd7ad3d1050769a01c2","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-1-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/810857/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810857/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 3xnqm54G57z9sRV\n\tfor ;\n\tThu, 7 Sep 2017 16:09:25 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753922AbdIGGIw (ORCPT );\n\tThu, 7 Sep 2017 02:08:52 -0400","from cmccmta1.chinamobile.com ([221.176.66.79]:55035 \"EHLO\n\tcmccmta1.chinamobile.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1753003AbdIGGIv (ORCPT\n\t); Thu, 7 Sep 2017 02:08:51 -0400","from spf.mail.chinamobile.com (unknown[172.16.121.1]) by\n\trmmx-syy-dmz-app02-12002 (RichMail) with SMTP id\n\t2ee259b0e270ae1-9cc20; Thu, 07 Sep 2017 14:08:48 +0800 (CST)","from localhost (unknown[223.105.0.240])\n\tby rmsmtp-syy-appsvr01-12001 (RichMail) with SMTP id\n\t2ee159b0e26f04c-118a5; Thu, 07 Sep 2017 14:08:48 +0800 (CST)"],"X-RM-TRANSID":["2ee259b0e270ae1-9cc20","2ee159b0e26f04c-118a5"],"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\tAlexei Starovoitov ","Subject":"[PATCH 1/2] ip_tunnel: fix setting ttl and tos value in collect_md\n\tmode","Date":"Thu, 7 Sep 2017 14:08:34 +0800","Message-Id":"<1504764515-13536-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":"ttl and tos variables are declared and assigned, but are not used in\niptunnel_xmit() function.\n\nFixes: cfc7381b3002 (\"ip_tunnel: add collect_md mode to IPIP tunnel\")\nCc: Alexei Starovoitov \nSigned-off-by: Haishuang Yan \n---\n net/ipv4/ip_tunnel.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c\nindex 129d1a3..e1856bf 100644\n--- a/net/ipv4/ip_tunnel.c\n+++ b/net/ipv4/ip_tunnel.c\n@@ -618,8 +618,8 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto)\n \t\tip_rt_put(rt);\n \t\tgoto tx_dropped;\n \t}\n-\tiptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, proto, key->tos,\n-\t\t key->ttl, df, !net_eq(tunnel->net, dev_net(dev)));\n+\tiptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, proto, tos, ttl,\n+\t\t df, !net_eq(tunnel->net, dev_net(dev)));\n \treturn;\n tx_error:\n \tdev->stats.tx_errors++;\n","prefixes":["1/2"]}