ipv4: export fib_info_update_nh_saddr

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 <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 79c18bd6a0591c5287cd41f2b0121165bb6796c6..8511ebb6f7beec97f21b0d9bb66af696c9ff2a37 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -201,7 +201,8 @@ static inline struct fib_nh_common *fib_info_nhc(struct fib_info *fi, int nhsel)
 #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);
 __be32 fib_result_prefsrc(struct net *net, struct fib_result *res);
 
 #define FIB_RES_NHC(res)               ((res).nhc)

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 4541121426fb4c0f98963234fe33ef3418cf07e3..bd8c51d2c59b83c8920cf25dc18d3f2f67c11010 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1189,11 +1189,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->fib_nh_dev,
-                                       nh->fib_nh_gw4,
-                                       nh->nh_parent->fib_scope);
+       nh->nh_saddr = inet_select_addr(nh->fib_nh_dev, nh->fib_nh_gw4, scope);
        nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
 
        return nh->nh_saddr;
@@ -1211,7 +1210,7 @@ __be32 fib_result_prefsrc(struct net *net, struct fib_result *res)
        if (nh->nh_saddr_genid == atomic_read(&net->ipv4.dev_addr_genid))
                return nh->nh_saddr;
 
-       return fib_info_update_nh_saddr(net, nh);
+       return fib_info_update_nh_saddr(net, nh, res->fi->fib_scope);
 }
 
 static bool fib_valid_prefsrc(struct fib_config *cfg, __be32 fib_prefsrc)
@@ -1393,7 +1392,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);
                if (nexthop_nh->fib_nh_gw_family == AF_INET6)
                        fi->fib_nh_is_v6 = true;
        } endfor_nexthops(fi)