Re: [PATCH v2 net-next 01/10] net/ipv4: Pass net to fib_multipath_hash instead of fib_info
flat view
From: David Ahern <hidden>
Date: 2018-03-02 15:28:55
On 3/2/18 6:12 AM, Ido Schimmel wrote:
On Thu, Mar 01, 2018 at 07:29:41PM -0800, David Ahern wrote:quoted
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 <redacted> --- 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.