summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_fib.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2007-12-13 09:45:12 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:57:55 -0800
commit528c4ceb427dad4a3893ba3d1913782efae0cd0e (patch)
tree96888eee6eeb8359c44413091bf6cd6ffa97873d /net/ipv6/ip6_fib.c
parentaef21785995778f710a60b563e03bf53ba455a47 (diff)
downloadlinux-3.10-528c4ceb427dad4a3893ba3d1913782efae0cd0e.tar.gz
linux-3.10-528c4ceb427dad4a3893ba3d1913782efae0cd0e.tar.bz2
linux-3.10-528c4ceb427dad4a3893ba3d1913782efae0cd0e.zip
[IPV6]: Always pass a valid nl_info to inet6_rt_notify.
This makes the code in the inet6_rt_notify more straightforward and provides groud for namespace passing. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
-rw-r--r--net/ipv6/ip6_fib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 5fae04506ad..df05c6f2189 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1315,6 +1315,7 @@ static int fib6_walk(struct fib6_walker_t *w)
static int fib6_clean_node(struct fib6_walker_t *w)
{
+ struct nl_info info = {};
int res;
struct rt6_info *rt;
struct fib6_cleaner_t *c = container_of(w, struct fib6_cleaner_t, w);
@@ -1323,7 +1324,7 @@ static int fib6_clean_node(struct fib6_walker_t *w)
res = c->func(rt, c->arg);
if (res < 0) {
w->leaf = rt;
- res = fib6_del(rt, NULL);
+ res = fib6_del(rt, &info);
if (res) {
#if RT6_DEBUG >= 2
printk(KERN_DEBUG "fib6_clean_node: del failed: rt=%p@%p err=%d\n", rt, rt->rt6i_node, res);