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

Commit 6454743b authored by David Ahern's avatar David Ahern Committed by Daniel Borkmann
Browse files

net/ipv6: Rename fib6_lookup to fib6_node_lookup 



Rename fib6_lookup to fib6_node_lookup to better reflect what it
returns. The fib6_lookup name will be used in a later patch for
an IPv6 equivalent to IPv4's fib_lookup.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 68625b76

include/net/ip6_fib.h

+3 −3
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6, 
				   const struct sk_buff *skb,

				   int flags, pol_lookup_t lookup);



struct fib6_node *fib6_lookup(struct fib6_node *root,

struct fib6_node *fib6_node_lookup(struct fib6_node *root,

				   const struct in6_addr *daddr,

				   const struct in6_addr *saddr);

net/ipv6/ip6_fib.c

+8 −6
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ struct lookup_args { 
	const struct in6_addr	*addr;		/* search key			*/

};



static struct fib6_node *fib6_lookup_1(struct fib6_node *root,

static struct fib6_node *fib6_node_lookup_1(struct fib6_node *root,

					    struct lookup_args *args)

{

	struct fib6_node *fn;
@@ -1400,7 +1400,8 @@ static struct fib6_node *fib6_lookup_1(struct fib6_node *root, 
#ifdef CONFIG_IPV6_SUBTREES

				if (subtree) {

					struct fib6_node *sfn;

					sfn = fib6_lookup_1(subtree, args + 1);

					sfn = fib6_node_lookup_1(subtree,

								 args + 1);

					if (!sfn)

						goto backtrack;

					fn = sfn;
@@ -1422,7 +1423,8 @@ static struct fib6_node *fib6_lookup_1(struct fib6_node *root, 


/* called with rcu_read_lock() held

 */

struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *daddr,

struct fib6_node *fib6_node_lookup(struct fib6_node *root,

				   const struct in6_addr *daddr,

				   const struct in6_addr *saddr)

{

	struct fib6_node *fn;
@@ -1442,7 +1444,7 @@ struct fib6_node *fib6_lookup(struct fib6_node *root, const struct in6_addr *dad 
		}

	};



	fn = fib6_lookup_1(root, daddr ? args : args + 1);

	fn = fib6_node_lookup_1(root, daddr ? args : args + 1);

	if (!fn || fn->fn_flags & RTN_TL_ROOT)

		fn = root;

net/ipv6/route.c

+4 −4
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static struct fib6_node* fib6_backtrack(struct fib6_node *fn, 
		pn = rcu_dereference(fn->parent);

		sn = FIB6_SUBTREE(pn);

		if (sn && sn != fn)

			fn = fib6_lookup(sn, NULL, saddr);

			fn = fib6_node_lookup(sn, NULL, saddr);

		else

			fn = pn;

		if (fn->fn_flags & RTN_RTINFO)
@@ -1059,7 +1059,7 @@ static struct rt6_info *ip6_pol_route_lookup(struct net *net, 
		flags &= ~RT6_LOOKUP_F_IFACE;



	rcu_read_lock();

	fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

	fn = fib6_node_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

restart:

	f6i = rcu_dereference(fn->leaf);

	if (!f6i) {
@@ -1815,7 +1815,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, 


	rcu_read_lock();



	fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

	fn = fib6_node_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

	saved_fn = fn;



	if (fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF)
@@ -2425,7 +2425,7 @@ static struct rt6_info *__ip6_route_redirect(struct net *net, 
	 */



	rcu_read_lock();

	fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

	fn = fib6_node_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

restart:

	for_each_fib6_node_rt_rcu(fn) {

		if (rt->fib6_nh.nh_flags & RTNH_F_DEAD)