From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f68.google.com ([74.125.83.68]:38101 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422707AbeCBP2z (ORCPT ); Fri, 2 Mar 2018 10:28:55 -0500 Received: by mail-pg0-f68.google.com with SMTP id l24so3905387pgc.5 for ; Fri, 02 Mar 2018 07:28:55 -0800 (PST) Subject: Re: [PATCH v2 net-next 01/10] net/ipv4: Pass net to fib_multipath_hash instead of fib_info To: Ido Schimmel Cc: netdev@vger.kernel.org, davem@davemloft.net, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, tom@herbertland.com References: <20180302032950.21154-1-dsahern@gmail.com> <20180302032950.21154-2-dsahern@gmail.com> <20180302131259.GA23979@splinter> From: David Ahern Message-ID: <449645ff-adbe-a40c-e89f-6930cd1454ae@gmail.com> Date: Fri, 2 Mar 2018 08:28:52 -0700 MIME-Version: 1.0 In-Reply-To: <20180302131259.GA23979@splinter> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org List-ID: On 3/2/18 6:12 AM, Ido Schimmel wrote: > On Thu, Mar 01, 2018 at 07:29:41PM -0800, David Ahern wrote: >> fib_multipath_hash only needs net struct to check a sysctl. Make it >> clear by passing net instead of fib_info. In the need this allows >> alignment between the ipv4 and ipv6 versions. >> >> Signed-off-by: David Ahern >> --- >> include/net/ip_fib.h | 5 +++-- >> net/ipv4/fib_semantics.c | 2 +- >> net/ipv4/route.c | 9 +++++---- >> 3 files changed, 9 insertions(+), 7 deletions(-) >> >> diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h >> index 8812582a94d5..1c4219e88726 100644 >> --- a/include/net/ip_fib.h >> +++ b/include/net/ip_fib.h >> @@ -395,8 +395,9 @@ int fib_sync_down_addr(struct net_device *dev, __be32 local); >> int fib_sync_up(struct net_device *dev, unsigned int nh_flags); >> >> #ifdef CONFIG_IP_ROUTE_MULTIPATH >> -int fib_multipath_hash(const struct fib_info *fi, const struct flowi4 *fl4, >> - const struct sk_buff *skb, struct flow_keys *flkeys); >> +int fib_multipath_hash(const struct net *net, const struct fib_info *fi, >> + const struct flowi4 *fl4, const struct sk_buff *skb, >> + struct flow_keys *flkeys); > > Why did you keep the fib info? > ugh. The whole point of this patch is to drop it. Must have been distracted rebasing it to top of tree.