mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipv4: export fib_info_update_nh_saddr

Browse source 
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>
This commit is contained in:
David Ahern 2019-05-22 12:04:45 -07:00 committed by David S. Miller
parent 9bd8366792
commit c3669486b5
2 changed files with 7 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/ip_fib.h
View file

@ -201,7 +201,8 @@ static inline struct fib_nh_common *fib_info_nhc(struct fib_info *fi, int nhsel)
#define FIB_TABLE_HASHSZ 2 #define FIB_TABLE_HASHSZ 2
#endif #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); __be32 fib_result_prefsrc(struct net *net, struct fib_result *res);
#define FIB_RES_NHC(res) ((res).nhc) #define FIB_RES_NHC(res) ((res).nhc)

11
net/ipv4/fib_semantics.c
View file

@ -1189,11 +1189,10 @@ static void fib_info_hash_move(struct hlist_head *new_info_hash,
fib_info_hash_free(old_laddrhash, bytes); 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->nh_saddr = inet_select_addr(nh->fib_nh_dev, nh->fib_nh_gw4, scope);
nh->fib_nh_gw4,
nh->nh_parent->fib_scope);
nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid); nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
return nh->nh_saddr; 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)) if (nh->nh_saddr_genid == atomic_read(&net->ipv4.dev_addr_genid))
return nh->nh_saddr; 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) 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) { 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) if (nexthop_nh->fib_nh_gw_family == AF_INET6)
fi->fib_nh_is_v6 = true; fi->fib_nh_is_v6 = true;
} endfor_nexthops(fi) } endfor_nexthops(fi)