From 69eb3d9d3415e096b71d4266e65fb3d040ccd27c Mon Sep 17 00:00:00 2001 From: Kim Nordlund Date: Wed, 13 Dec 2006 16:38:29 -0800 Subject: [PATCH] --- yaml --- r: 44601 b: refs/heads/master c: 8bce65b95ac167693ae2d706b5341409dca0062d h: refs/heads/master i: 44599: 6c337b9bc0f14ec67e086eedc2291a1a81abe77c v: v3 --- [refs] | 2 +- trunk/include/net/ip6_fib.h | 4 ++-- trunk/net/ipv6/route.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f872c8441aee..d534bf91faa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ab792f577012312a760a3a1e679ae8fae012442 +refs/heads/master: 8bce65b95ac167693ae2d706b5341409dca0062d diff --git a/trunk/include/net/ip6_fib.h b/trunk/include/net/ip6_fib.h index f9cde44f93b4..7be4f4e3a0f2 100644 --- a/trunk/include/net/ip6_fib.h +++ b/trunk/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/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 9f80518aacbd..8c3d56871b50 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/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) \