From patchwork Tue Sep 12 07:05:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haishuang Yan X-Patchwork-Id: 812706 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xrwmf256gz9sBZ for ; Tue, 12 Sep 2017 17:05:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751327AbdILHF1 (ORCPT ); Tue, 12 Sep 2017 03:05:27 -0400 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:39050 "EHLO cmccmta1.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751110AbdILHFY (ORCPT ); Tue, 12 Sep 2017 03:05:24 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.5]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee259b7872f1ac-0d479; Tue, 12 Sep 2017 15:05:19 +0800 (CST) X-RM-TRANSID: 2ee259b7872f1ac-0d479 X-RM-SPAM-FLAG: 00000000 Received: from localhost (unknown[223.105.0.240]) by rmsmtp-syy-appsvr03-12003 (RichMail) with SMTP id 2ee359b7872e389-658c5; Tue, 12 Sep 2017 15:05:19 +0800 (CST) X-RM-TRANSID: 2ee359b7872e389-658c5 From: Haishuang Yan To: "David S. Miller" , pravin shelar , Girish Moodalbail Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haishuang Yan Subject: [PATCH v2] geneve: Fix setting ttl value in collect metadata mode Date: Tue, 12 Sep 2017 15:05:11 +0800 Message-Id: <1505199911-21153-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 Similar to vxlan/ipip tunnel, if key->tos is zero in collect metadata mode, tos should also fallback to ip{4,6}_dst_hoplimit. Signed-off-by: Haishuang Yan --- Changes since v2: * Make the commit message more clearer. --- drivers/net/geneve.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index f640407..d52a65f 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -834,11 +834,10 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); if (geneve->collect_md) { tos = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb); - ttl = key->ttl; } else { tos = ip_tunnel_ecn_encap(fl4.flowi4_tos, ip_hdr(skb), skb); - ttl = key->ttl ? : ip4_dst_hoplimit(&rt->dst); } + ttl = key->ttl ? : ip4_dst_hoplimit(&rt->dst); df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; err = geneve_build_skb(&rt->dst, skb, info, xnet, sizeof(struct iphdr)); @@ -873,12 +872,11 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); if (geneve->collect_md) { prio = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb); - ttl = key->ttl; } else { prio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel), ip_hdr(skb), skb); - ttl = key->ttl ? : ip6_dst_hoplimit(dst); } + ttl = key->ttl ? : ip6_dst_hoplimit(dst); err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr)); if (unlikely(err)) return err;