From mboxrd@z Thu Jan 1 00:00:00 1970 From: dsahern@kernel.org Subject: [PATCH RFC net-next 03/18] net/ipv4: export fib_info_update_nh_saddr Date: Fri, 31 Aug 2018 17:49:38 -0700 Message-ID: <20180901004954.7145-4-dsahern@kernel.org> References: <20180901004954.7145-1-dsahern@kernel.org> Cc: roopa@cumulusnetworks.com, sharpd@cumulusnetworks.com, idosch@mellanox.com, davem@davemloft.net, David Ahern To: netdev@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:36788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbeIAFUS (ORCPT ); Sat, 1 Sep 2018 01:20:18 -0400 In-Reply-To: <20180901004954.7145-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: From: David Ahern Add scope as input argument versus relying on fib_info reference in fib_nh and export fib_info_update_nh_saddr. Signed-off-by: David Ahern --- include/net/ip_fib.h | 5 +++-- net/ipv4/fib_semantics.c | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index f1c053cf9489..a4a129344098 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -173,13 +173,14 @@ struct fib_result_nl { #define FIB_TABLE_HASHSZ 2 #endif -__be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh); +__be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh, + unsigned char scope); #define FIB_RES_SADDR(net, res) \ ((FIB_RES_NH(res).nh_saddr_genid == \ atomic_read(&(net)->ipv4.dev_addr_genid)) ? \ FIB_RES_NH(res).nh_saddr : \ - fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) + fib_info_update_nh_saddr((net), &FIB_RES_NH(res), (res).fi->fib_scope)) #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw) #define FIB_RES_DEV(res) (FIB_RES_NH(res).nh_dev) #define FIB_RES_OIF(res) (FIB_RES_NH(res).nh_oif) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 7bead7c03e1b..c034d0adf590 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -984,11 +984,10 @@ static void fib_info_hash_move(struct hlist_head *new_info_hash, fib_info_hash_free(old_laddrhash, bytes); } -__be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh) +__be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh, + unsigned char scope) { - nh->nh_saddr = inet_select_addr(nh->nh_dev, - nh->nh_gw, - nh->nh_parent->fib_scope); + nh->nh_saddr = inet_select_addr(nh->nh_dev, nh->nh_gw, scope); nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid); return nh->nh_saddr; @@ -1238,7 +1237,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, } change_nexthops(fi) { - fib_info_update_nh_saddr(net, nexthop_nh); + fib_info_update_nh_saddr(net, nexthop_nh, fi->fib_scope); } endfor_nexthops(fi) fib_rebalance(fi); -- 2.11.0