2 files changed, 5 insertions, 8 deletions

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index c72fd2461ca5..08ea2de28d63 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1453,9 +1453,8 @@ void fib6_run_gc(unsigned long expires, struct net *net)
                 }
                 gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval;
         }
-        gc_args.more = 0;
 
-        icmp6_dst_gc(&gc_args.more);
+        gc_args.more = icmp6_dst_gc();
 
         fib6_clean_all(net, fib6_age, 0, NULL);
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 615b328de251..86540b24b27c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -978,13 +978,12 @@ out:
         return &rt->u.dst;
 }
 
-int icmp6_dst_gc(int *more)
+int icmp6_dst_gc(void)
 {
         struct dst_entry *dst, *next, **pprev;
-        int freed;
+        int more = 0;
 
         next = NULL;
-        freed = 0;
 
         spin_lock_bh(&icmp6_dst_lock);
         pprev = &icmp6_dst_gc_list;
@@ -993,16 +992,15 @@ int icmp6_dst_gc(int *more)
                 if (!atomic_read(&dst->__refcnt)) {
                         *pprev = dst->next;
                         dst_free(dst);
-                        freed++;
                 } else {
                         pprev = &dst->next;
-                        (*more)++;
+                        ++more;
                 }
         }
 
         spin_unlock_bh(&icmp6_dst_lock);
 
-        return freed;
+        return more;
 }
 
 static int ip6_dst_gc(struct dst_ops *ops)