summaryrefslogtreecommitdiffstats
path: root/net/rose/af_rose.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-05-03 23:28:20 -0700
committerDavid S. Miller <davem@davemloft.net>2006-05-03 23:28:20 -0700
commit82e84249f0ee098e004c8bd6d90a1640bd56cfbb (patch)
tree26c59ccd404255839b0c26709ebc0f54a99f0ab8 /net/rose/af_rose.c
parent4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 (diff)
downloadlinux-82e84249f0ee098e004c8bd6d90a1640bd56cfbb.tar.gz
linux-82e84249f0ee098e004c8bd6d90a1640bd56cfbb.tar.bz2
linux-82e84249f0ee098e004c8bd6d90a1640bd56cfbb.zip
[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/af_rose.c')
-rw-r--r--net/rose/af_rose.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index ea65396d1619..ef4538ac84f0 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -518,11 +518,11 @@ static int rose_create(struct socket *sock, int protocol)
init_timer(&rose->timer);
init_timer(&rose->idletimer);
- rose->t1 = sysctl_rose_call_request_timeout;
- rose->t2 = sysctl_rose_reset_request_timeout;
- rose->t3 = sysctl_rose_clear_request_timeout;
- rose->hb = sysctl_rose_ack_hold_back_timeout;
- rose->idle = sysctl_rose_no_activity_timeout;
+ rose->t1 = msecs_to_jiffies(sysctl_rose_call_request_timeout);
+ rose->t2 = msecs_to_jiffies(sysctl_rose_reset_request_timeout);
+ rose->t3 = msecs_to_jiffies(sysctl_rose_clear_request_timeout);
+ rose->hb = msecs_to_jiffies(sysctl_rose_ack_hold_back_timeout);
+ rose->idle = msecs_to_jiffies(sysctl_rose_no_activity_timeout);
rose->state = ROSE_STATE_0;