diff options
author | Jarek Poplawski <jarkao2@gmail.com> | 2008-02-12 00:38:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-12 20:53:34 -0500 |
commit | e848b583e03306f5f9b3a66a793c37e3649e04ca (patch) | |
tree | d7772ed15a4a4bb8148a936744770b92658273c9 /net/ax25/ax25_dev.c | |
parent | 21fab4a86a411c18c6b4d663ae710ca1f6206b3c (diff) |
[AX25] ax25_ds_timer: use mod_timer instead of add_timer
This patch changes current use of: init_timer(), add_timer()
and del_timer() to setup_timer() with mod_timer(), which
should be safer anyway.
Reported-by: Jann Traschewski <jann@gmx.de>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25/ax25_dev.c')
-rw-r--r-- | net/ax25/ax25_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index 528c874d982..a7a0e0c9698 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c | |||
@@ -82,7 +82,7 @@ void ax25_dev_device_up(struct net_device *dev) | |||
82 | ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT; | 82 | ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT; |
83 | 83 | ||
84 | #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER) | 84 | #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER) |
85 | init_timer(&ax25_dev->dama.slave_timer); | 85 | ax25_ds_setup_timer(ax25_dev); |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | spin_lock_bh(&ax25_dev_lock); | 88 | spin_lock_bh(&ax25_dev_lock); |