Convert addrconf_verify to mod_timer
Signed-off-by: Benoit Boissinot <redacted>
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 101e0e7..5d0e404 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2922,8 +2943,6 @@ static void addrconf_verify(unsigned long foo)
now = jiffies;
next = now + ADDR_CHECK_FREQUENCY;
- del_timer(&addr_chk_timer);
-
for (i=0; i < IN6_ADDR_HSIZE; i++) {
restart:@@ -3013,8 +3032,7 @@ restart:
read_unlock(&addrconf_hash_lock);
}
- addr_chk_timer.expires = time_before(next, jiffies + HZ) ? jiffies + HZ : next;
- add_timer(&addr_chk_timer);
+ mod_timer(&addr_chk_timer, time_before(next, jiffies + HZ) ? jiffies + HZ : next);
spin_unlock_bh(&addrconf_verify_lock);
}
--
:wq