tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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>

authored by

Kim Nordlund and committed by
David S. Miller 8bce65b9 6ab792f5

+3 -3
+2 -2
include/net/ip6_fib.h
··· 50 50 struct fib6_node *parent; 51 51 struct fib6_node *left; 52 52 struct fib6_node *right; 53 - 53 + #ifdef CONFIG_IPV6_SUBTREES 54 54 struct fib6_node *subtree; 55 - 55 + #endif 56 56 struct rt6_info *leaf; 57 57 58 58 __u16 fn_bit; /* bit key */
+1 -1
net/ipv6/route.c
··· 494 494 goto out; \ 495 495 pn = fn->parent; \ 496 496 if (FIB6_SUBTREE(pn) && FIB6_SUBTREE(pn) != fn) \ 497 - fn = fib6_lookup(pn->subtree, NULL, saddr); \ 497 + fn = fib6_lookup(FIB6_SUBTREE(pn), NULL, saddr); \ 498 498 else \ 499 499 fn = pn; \ 500 500 if (fn->fn_flags & RTN_RTINFO) \