Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3669486 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9bd83667

include/net/ip_fib.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -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)

net/ipv4/fib_semantics.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -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)