Commit 8bce65b9 authored Dec 13, 2006 by Kim Nordlund Committed by David S. Miller Dec 13, 2006

[IPV6]: Make fib6_node subtree depend on IPV6_SUBTREES



Make fib6_node 'subtree' depend on IPV6_SUBTREES.

Signed-off-by: Kim Nordlund <kim.nordlund@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6ab792f5

include/net/ip6_fib.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,9 +50,9 @@ struct fib6_node
		struct fib6_node *parent;
		struct fib6_node *left;
		struct fib6_node *right;

		#ifdef CONFIG_IPV6_SUBTREES
		struct fib6_node *subtree;

		#endif
		struct rt6_info *leaf;

		__u16 fn_bit; /* bit key */

net/ipv6/route.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ do { \
		goto out; \
		pn = fn->parent; \
		if (FIB6_SUBTREE(pn) && FIB6_SUBTREE(pn) != fn) \
		fn = fib6_lookup(pn->subtree, NULL, saddr); \
		fn = fib6_lookup(FIB6_SUBTREE(pn), NULL, saddr); \
		else \
		fn = pn; \
		if (fn->fn_flags & RTN_RTINFO) \