X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Frose%2Frose_link.c;h=09e9e9d04d92a9a8b0198e6b5cef4c66d845c26c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=bd86a63960ce3114ad4c6c3ae8a90804d6b66d66;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c
index bd86a6396..09e9e9d04 100644
--- a/net/rose/rose_link.c
+++ b/net/rose/rose_link.c
@@ -40,8 +40,7 @@ void rose_start_ftimer(struct rose_neigh *neigh)
 
 	neigh->ftimer.data     = (unsigned long)neigh;
 	neigh->ftimer.function = &rose_ftimer_expiry;
-	neigh->ftimer.expires  =
-		jiffies + msecs_to_jiffies(sysctl_rose_link_fail_timeout);
+	neigh->ftimer.expires  = jiffies + sysctl_rose_link_fail_timeout;
 
 	add_timer(&neigh->ftimer);
 }
@@ -52,8 +51,7 @@ static void rose_start_t0timer(struct rose_neigh *neigh)
 
 	neigh->t0timer.data     = (unsigned long)neigh;
 	neigh->t0timer.function = &rose_t0timer_expiry;
-	neigh->t0timer.expires  =
-		jiffies + msecs_to_jiffies(sysctl_rose_restart_request_timeout);
+	neigh->t0timer.expires  = jiffies + sysctl_rose_restart_request_timeout;
 
 	add_timer(&neigh->t0timer);
 }