summaryrefslogtreecommitdiff
path: root/net/rose/rose_link.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-05-04 06:28:20 (GMT)
committerDavid S. Miller <davem@davemloft.net>2006-05-04 06:28:20 (GMT)
commit82e84249f0ee098e004c8bd6d90a1640bd56cfbb (patch)
tree26c59ccd404255839b0c26709ebc0f54a99f0ab8 /net/rose/rose_link.c
parent4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 (diff)
downloadlinux-82e84249f0ee098e004c8bd6d90a1640bd56cfbb.tar.xz
[ROSE]: Eleminate HZ from ROSE kernel interfaces
Convert all ROSE sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/rose_link.c')
-rw-r--r--net/rose/rose_link.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c
index 09e9e9d..bd86a63 100644
--- a/net/rose/rose_link.c
+++ b/net/rose/rose_link.c
@@ -40,7 +40,8 @@ void rose_start_ftimer(struct rose_neigh *neigh)
neigh->ftimer.data = (unsigned long)neigh;
neigh->ftimer.function = &rose_ftimer_expiry;
- neigh->ftimer.expires = jiffies + sysctl_rose_link_fail_timeout;
+ neigh->ftimer.expires =
+ jiffies + msecs_to_jiffies(sysctl_rose_link_fail_timeout);
add_timer(&neigh->ftimer);
}
@@ -51,7 +52,8 @@ 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 + sysctl_rose_restart_request_timeout;
+ neigh->t0timer.expires =
+ jiffies + msecs_to_jiffies(sysctl_rose_restart_request_timeout);
add_timer(&neigh->t0timer);
}