From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: Re: [PATCH net-next] geneve: fix ttl inherit type Date: Fri, 28 Sep 2018 11:59:37 -0600 Message-ID: References: <1538096998-20937-1-git-send-email-liuhangbin@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: David Miller , Stephen Hemminger , Phil Sutter To: Hangbin Liu , netdev@vger.kernel.org Return-path: Received: from mail-pg1-f196.google.com ([209.85.215.196]:35461 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbeI2AYf (ORCPT ); Fri, 28 Sep 2018 20:24:35 -0400 Received: by mail-pg1-f196.google.com with SMTP id v133-v6so5013226pgb.2 for ; Fri, 28 Sep 2018 10:59:40 -0700 (PDT) In-Reply-To: <1538096998-20937-1-git-send-email-liuhangbin@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 9/27/18 7:09 PM, Hangbin Liu wrote: > Phil pointed out that there is a mismatch between vxlan and geneve ttl > inherit. We should define it as a flag and use nla_put_flag to export this > opiton. > > Fixes: 52d0d404d39dd ("geneve: add ttl inherit support") same here .. getting an unknown commit id. > Reported-by: Phil Sutter > Signed-off-by: Hangbin Liu > --- > drivers/net/geneve.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c > index 6625fab..09ab2fd 100644 > --- a/drivers/net/geneve.c > +++ b/drivers/net/geneve.c > @@ -1100,7 +1100,7 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = { > [IFLA_GENEVE_UDP_CSUM] = { .type = NLA_U8 }, > [IFLA_GENEVE_UDP_ZERO_CSUM6_TX] = { .type = NLA_U8 }, > [IFLA_GENEVE_UDP_ZERO_CSUM6_RX] = { .type = NLA_U8 }, > - [IFLA_GENEVE_TTL_INHERIT] = { .type = NLA_U8 }, > + [IFLA_GENEVE_TTL_INHERIT] = { .type = NLA_FLAG }, > }; > > static int geneve_validate(struct nlattr *tb[], struct nlattr *data[], > @@ -1582,7 +1582,7 @@ static size_t geneve_get_size(const struct net_device *dev) > nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_CSUM */ > nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_TX */ > nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_UDP_ZERO_CSUM6_RX */ > - nla_total_size(sizeof(__u8)) + /* IFLA_GENEVE_TTL_INHERIT */ > + nla_total_size(0) + /* IFLA_GENEVE_TTL_INHERIT */ > 0; > } > > @@ -1636,7 +1636,7 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev) > goto nla_put_failure; > #endif > > - if (nla_put_u8(skb, IFLA_GENEVE_TTL_INHERIT, ttl_inherit)) > + if (ttl_inherit && nla_put_flag(skb, IFLA_GENEVE_TTL_INHERIT)) > goto nla_put_failure; > > return 0; >