diff options
| author | Kim Nordlund <kim.nordlund@nokia.com> | 2006-12-13 16:38:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-13 16:48:31 -0800 |
| commit | 8bce65b95ac167693ae2d706b5341409dca0062d (patch) | |
| tree | d73baf0f20809543a09a2c9cb27c54003af2d460 | |
| parent | 6ab792f577012312a760a3a1e679ae8fae012442 (diff) | |
| download | linux-3.10-8bce65b95ac167693ae2d706b5341409dca0062d.tar.gz linux-3.10-8bce65b95ac167693ae2d706b5341409dca0062d.tar.bz2 linux-3.10-8bce65b95ac167693ae2d706b5341409dca0062d.zip | |
[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>
| -rw-r--r-- | include/net/ip6_fib.h | 4 | ||||
| -rw-r--r-- | net/ipv6/route.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index f9cde44f93b..7be4f4e3a0f 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -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 */ diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 9f80518aacb..8c3d56871b5 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -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) \ |