Merge branch 'master'

1 files changed, 3 insertions, 5 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f7f42c3e96cb..9a71a8d1078a 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1701,10 +1701,8 @@ static void fib6_dump_end(struct netlink_callback *cb)
                 fib6_walker_unlink(w);
                 kfree(w);
         }
-        if (cb->args[1]) {
-                cb->done = (void*)cb->args[1];
-                cb->args[1] = 0;
-        }
+        cb->done = (void*)cb->args[1];
+        cb->args[1] = 0;
 }
 
 static int fib6_dump_done(struct netlink_callback *cb)
@@ -1734,7 +1732,7 @@ int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
                 /*
                  * 2. allocate and initialize walker.
                  */
-                w = kmalloc(sizeof(*w), GFP_ATOMIC);
+                w = kmalloc(sizeof(*w), GFP_KERNEL);
                 if (w == NULL)
                         return -ENOMEM;
                 RT6_TRACE("dump<%p", w);