From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f67.google.com ([209.85.160.67]:41428 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164101AbeCBDaA (ORCPT ); Thu, 1 Mar 2018 22:30:00 -0500 Received: by mail-pl0-f67.google.com with SMTP id k8-v6so4896016pli.8 for ; Thu, 01 Mar 2018 19:29:59 -0800 (PST) From: David Ahern To: netdev@vger.kernel.org Cc: idosch@idosch.org, davem@davemloft.net, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, tom@herbertland.com, David Ahern Subject: [PATCH v2 net-next 01/10] net/ipv4: Pass net to fib_multipath_hash instead of fib_info Date: Thu, 1 Mar 2018 19:29:41 -0800 Message-Id: <20180302032950.21154-2-dsahern@gmail.com> In-Reply-To: <20180302032950.21154-1-dsahern@gmail.com> References: <20180302032950.21154-1-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: 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); #endif void fib_select_multipath(struct fib_result *res, int hash); void fib_select_path(struct net *net, struct fib_result *res, diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 181b0d8d589c..02c1ff19a46f 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -1770,7 +1770,7 @@ void fib_select_path(struct net *net, struct fib_result *res, #ifdef CONFIG_IP_ROUTE_MULTIPATH if (res->fi->fib_nhs > 1) { - int h = fib_multipath_hash(res->fi, fl4, skb, NULL); + int h = fib_multipath_hash(net, res->fi, fl4, skb, NULL); fib_select_multipath(res, h); } diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 3bb686dac273..5615d26b3db7 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1782,10 +1782,10 @@ static void ip_multipath_l3_keys(const struct sk_buff *skb, } /* if skb is set it will be used and fl4 can be NULL */ -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) { - struct net *net = fi->fib_net; struct flow_keys hash_keys; u32 mhash; @@ -1852,7 +1852,8 @@ static int ip_mkroute_input(struct sk_buff *skb, { #ifdef CONFIG_IP_ROUTE_MULTIPATH if (res->fi && res->fi->fib_nhs > 1) { - int h = fib_multipath_hash(res->fi, NULL, skb, hkeys); + int h = fib_multipath_hash(res->fi->fib_net, res->fi, + NULL, skb, hkeys); fib_select_multipath(res, h); } -- 2.11.0