git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
ax25
/
ax25_ds_timer.c
diff --git
a/net/ax25/ax25_ds_timer.c
b/net/ax25/ax25_ds_timer.c
index
3a8b673
..
5961459
100644
(file)
--- a/
net/ax25/ax25_ds_timer.c
+++ b/
net/ax25/ax25_ds_timer.c
@@
-18,7
+18,7
@@
#include <linux/string.h>
#include <linux/sockios.h>
#include <linux/net.h>
#include <linux/string.h>
#include <linux/sockios.h>
#include <linux/net.h>
-#include <net/tcp.h>
+#include <net/tcp
_states
.h>
#include <net/ax25.h>
#include <linux/inet.h>
#include <linux/netdevice.h>
#include <net/ax25.h>
#include <linux/inet.h>
#include <linux/netdevice.h>
@@
-61,7
+61,8
@@
void ax25_ds_set_timer(ax25_dev *ax25_dev)
return;
del_timer(&ax25_dev->dama.slave_timer);
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);
}
ax25_ds_add_timer(ax25_dev);
}