summaryrefslogtreecommitdiffstats
path: root/net/ax25/ax25_ds_timer.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-05-04 08:27:16 +0200
committerDavid S. Miller <davem@davemloft.net>2006-05-04 08:27:16 +0200
commite1fdb5b39656ea2be8cadde565e543649a988af9 (patch)
tree1e8af7a60fb23c871cd3c6db194156563bce1e18 /net/ax25/ax25_ds_timer.c
parent[ROSE]: Fix routing table locking in rose_remove_neigh. (diff)
downloadlinux-e1fdb5b39656ea2be8cadde565e543649a988af9.tar.xz
linux-e1fdb5b39656ea2be8cadde565e543649a988af9.zip
[AX.25]: Eleminate HZ from AX.25 kernel interfaces
Convert all AX.25 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/ax25/ax25_ds_timer.c')
-rw-r--r--net/ax25/ax25_ds_timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c
index 061083efc1dc..5961459935eb 100644
--- a/net/ax25/ax25_ds_timer.c
+++ b/net/ax25/ax25_ds_timer.c
@@ -61,7 +61,8 @@ void ax25_ds_set_timer(ax25_dev *ax25_dev)
return;
del_timer(&ax25_dev->dama.slave_timer);
- ax25_dev->dama.slave_timeout = ax25_dev->values[AX25_VALUES_DS_TIMEOUT] / 10;
+ ax25_dev->dama.slave_timeout =
+ msecs_to_jiffies(ax25_dev->values[AX25_VALUES_DS_TIMEOUT]) / 10;
ax25_ds_add_timer(ax25_dev);
}