diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2006-08-23 17:22:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 14:55:53 -0700 |
| commit | 150730d5a53b1bbb486101b2a5fb82ff0d3f916e (patch) | |
| tree | d14162b46a962ee3f2e15efd59ff3fd79882ee9d | |
| parent | 982f56f3a9be4651520c0fdd3d80a5d02e95a178 (diff) | |
| download | linux-stable-150730d5a53b1bbb486101b2a5fb82ff0d3f916e.tar.gz linux-stable-150730d5a53b1bbb486101b2a5fb82ff0d3f916e.tar.bz2 linux-stable-150730d5a53b1bbb486101b2a5fb82ff0d3f916e.zip | |
[IPV6] ROUTE: Purge clones on other trees when deleting a route.
Based on MIPL2 kernel patch.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Ville Nuorvala <vnuorval@tcs.hut.fi
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6_fib.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 6536e33d8353..f0fdaf182b3f 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1169,8 +1169,18 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info) BUG_TRAP(fn->fn_flags&RTN_RTINFO); - if (!(rt->rt6i_flags&RTF_CACHE)) - fib6_prune_clones(fn, rt); + if (!(rt->rt6i_flags&RTF_CACHE)) { + struct fib6_node *pn = fn; +#ifdef CONFIG_IPV6_SUBTREES + /* clones of this route might be in another subtree */ + if (rt->rt6i_src.plen) { + while (!(pn->fn_flags&RTN_ROOT)) + pn = pn->parent; + pn = pn->parent; + } +#endif + fib6_prune_clones(pn, rt); + } /* * Walk the leaf entries looking for ourself |