[IPV6]: Make fib6_node subtree depend on IPV6_SUBTREES
Kim Nordlund [Thu, 14 Dec 2006 00:38:29 +0000 (16:38 -0800)]
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>

include/net/ip6_fib.h
net/ipv6/route.c

index f9cde44..7be4f4e 100644 (file)
@@ -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 */
index 9f80518..8c3d568 100644 (file)
@@ -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) \