Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752945AbdICMtz (ORCPT ); Sun, 3 Sep 2017 08:49:55 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:32774 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752353AbdICMtw (ORCPT ); Sun, 3 Sep 2017 08:49:52 -0400 X-RM-TRANSID: 2ee759abfa6c414-374e8 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee559abfa6c2b4-24201 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] 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1571 Lines: 43 If key->tos is zero in collect metadata mode, tos should fallback to ip{4,6}_dst_hoplimit, same as normal mode. Signed-off-by: Haishuang Yan --- 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; -- 1.8.3.1