Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8bce65b95ac167693ae2d706b5341409dca0062d
Commit:     8bce65b95ac167693ae2d706b5341409dca0062d
Parent:     6ab792f577012312a760a3a1e679ae8fae012442
Author:     Kim Nordlund <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 13 16:38:29 2006 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Dec 13 16:48:31 2006 -0800

    [IPV6]: Make fib6_node subtree depend on IPV6_SUBTREES
    
    Make fib6_node 'subtree' depend on IPV6_SUBTREES.
    
    Signed-off-by: Kim Nordlund <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 include/net/ip6_fib.h |    4 ++--
 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 f9cde44..7be4f4e 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 9f80518..8c3d568 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) \
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to