From 6ddcc456547b217c3b1a12b1661f033645482f63 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 22 Jul 2008 14:34:09 -0700
Subject: [PATCH] --- yaml --- r: 104887 b: refs/heads/master c:
 c8a4522245e9931a53a98d5160bb4c00d3f73921 h: refs/heads/master i:   104885:
 00137bbfacc95f0635f11c0f61c440599c3f213e   104883:
 825d0efb5a03a7137f41a441bf76a626aafc8011   104879:
 23ed21b0e2b97745c12c4285cecb56d84c15717e v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv6/ip6_fib.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57b832de5558..d4b4bb165342 100644
--- 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
index e0922975c410..03e23d058ec5 100644
--- 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);