diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-02-11 21:36:39 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-12 17:53:33 -0800 |
| commit | 21fab4a86a411c18c6b4d663ae710ca1f6206b3c (patch) | |
| tree | ae10e8f7571a04cb16147403bb8a11e8e55d8d10 /net/ax25/af_ax25.c | |
| parent | 4de211f1a279275c6c67d6e9b6b25513e46b0bb9 (diff) | |
| download | linux-stable-21fab4a86a411c18c6b4d663ae710ca1f6206b3c.tar.gz linux-stable-21fab4a86a411c18c6b4d663ae710ca1f6206b3c.tar.bz2 linux-stable-21fab4a86a411c18c6b4d663ae710ca1f6206b3c.zip | |
[AX25] ax25_timer: use mod_timer instead of add_timer
According to one of Jann's OOPS reports it looks like
BUG_ON(timer_pending(timer)) triggers during add_timer()
in ax25_start_t1timer(). 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/af_ax25.c')
| -rw-r--r-- | net/ax25/af_ax25.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 5a4337a29094..48bfcc741f25 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -510,11 +510,7 @@ ax25_cb *ax25_create_cb(void) skb_queue_head_init(&ax25->ack_queue); skb_queue_head_init(&ax25->reseq_queue); - init_timer(&ax25->timer); - init_timer(&ax25->t1timer); - init_timer(&ax25->t2timer); - init_timer(&ax25->t3timer); - init_timer(&ax25->idletimer); + ax25_setup_timers(ax25); ax25_fillin_cb(ax25, NULL); |