Commit 8bce65b9 authored by Kim Nordlund's avatar Kim Nordlund Committed by David S. Miller
Browse files

[IPV6]: Make fib6_node subtree depend on IPV6_SUBTREES



Make fib6_node 'subtree' depend on IPV6_SUBTREES.
Signed-off-by: default avatarKim Nordlund <kim.nordlund@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ab792f5
......@@ -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 */
......
......@@ -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) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment