---

yaml --- r: 104887 b: refs/heads/master c: c8a4522 h: refs/heads/master i: 104885: 00137bb 104883: 825d0ef 104879: 23ed21b v: v3
git-mirror · Jul 22, 2008 · 6ddcc45 · 6ddcc45
1 parent 27103ed
commit 6ddcc45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 417f28bb340725544c36b35465444d2fd57232b8
+refs/heads/master: c8a4522245e9931a53a98d5160bb4c00d3f73921
diff --git a/trunk/net/ipv6/ip6_fib.c b/trunk/net/ipv6/ip6_fib.c
@@ -1462,8 +1462,9 @@ void fib6_run_gc(unsigned long expires, struct net *net)
 	fib6_clean_all(net, fib6_age, 0, NULL);
 
 	if (gc_args.more)
-		mod_timer(&net->ipv6.ip6_fib_timer, jiffies +
-			  net->ipv6.sysctl.ip6_rt_gc_interval);
+		mod_timer(&net->ipv6.ip6_fib_timer,
+			  round_jiffies(jiffies
+					+ net->ipv6.sysctl.ip6_rt_gc_interval));
 	else
 		del_timer(&net->ipv6.ip6_fib_timer);
 	spin_unlock_bh(&fib6_gc_lock);