1 files changed, 27 insertions, 2 deletions

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index f626ea2b304f..77e122f53ea6 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -319,12 +319,26 @@ static int fib6_dump_table(struct fib6_table *table, struct sk_buff *skb,
         w->root = &table->tb6_root;
 
         if (cb->args[4] == 0) {
+                w->count = 0;
+                w->skip = 0;
+
                 read_lock_bh(&table->tb6_lock);
                 res = fib6_walk(w);
                 read_unlock_bh(&table->tb6_lock);
-                if (res > 0)
+                if (res > 0) {
                         cb->args[4] = 1;
+                        cb->args[5] = w->root->fn_sernum;
+                }
         } else {
+                if (cb->args[5] != w->root->fn_sernum) {
+                        /* Begin at the root if the tree changed */
+                        cb->args[5] = w->root->fn_sernum;
+                        w->state = FWS_INIT;
+                        w->node = w->root;
+                        w->skip = w->count;
+                } else
+                        w->skip = 0;
+
                 read_lock_bh(&table->tb6_lock);
                 res = fib6_walk_continue(w);
                 read_unlock_bh(&table->tb6_lock);
@@ -1250,9 +1264,18 @@ static int fib6_walk_continue(struct fib6_walker_t *w)
                         w->leaf = fn->leaf;
                 case FWS_C:
                         if (w->leaf && fn->fn_flags&RTN_RTINFO) {
-                                int err = w->func(w);
+                                int err;
+
+                                if (w->count < w->skip) {
+                                        w->count++;
+                                        continue;
+                                }
+
+                                err = w->func(w);
                                 if (err)
                                         return err;
+
+                                w->count++;
                                 continue;
                         }
                         w->state = FWS_U;
@@ -1346,6 +1369,8 @@ static void fib6_clean_tree(struct net *net, struct fib6_node *root,
         c.w.root = root;
         c.w.func = fib6_clean_node;
         c.w.prune = prune;
+        c.w.count = 0;
+        c.w.skip = 0;
         c.func = func;
         c.arg = arg;
         c.net = net;