Merge branch 'master' of ../linux-2.6/

[linux-2.6] / net / ipv6 / ip6_fib.c

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 0e83164aa3e671b85b28aeee89aa93edaed45947..bab72b6f14444f9701d830ff6d93f009bb753926 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1151,7 +1151,7 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,
                        fn = fn->parent;
                }
                /* No more references are possible at this point. */
-               if (atomic_read(&rt->rt6i_ref) != 1) BUG();
+               BUG_ON(atomic_read(&rt->rt6i_ref) != 1);
        }
 
        inet6_rt_notify(RTM_DELROUTE, rt, info);
@@ -1314,7 +1314,9 @@ static int fib6_walk(struct fib6_walker_t *w)
 
 static int fib6_clean_node(struct fib6_walker_t *w)
 {
-       struct nl_info info = {};
+       struct nl_info info = {
+               .nl_net = &init_net,
+       };
        int res;
        struct rt6_info *rt;
        struct fib6_cleaner_t *c = container_of(w, struct fib6_cleaner_t, w);