summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-02-12 08:36:39 +0300
committerDavid S. Miller <davem@davemloft.net>2008-02-13 04:53:33 +0300
commit21fab4a86a411c18c6b4d663ae710ca1f6206b3c (patch)
treeae10e8f7571a04cb16147403bb8a11e8e55d8d10 /include/net
parent4de211f1a279275c6c67d6e9b6b25513e46b0bb9 (diff)
downloadlinux-21fab4a86a411c18c6b4d663ae710ca1f6206b3c.tar.xz
[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 'include/net')
-rw-r--r--include/net/ax25.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 32a57e1dee3a..3f0236f1d23e 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -416,6 +416,7 @@ extern void ax25_calculate_rtt(ax25_cb *);
extern void ax25_disconnect(ax25_cb *, int);
/* ax25_timer.c */
+extern void ax25_setup_timers(ax25_cb *);
extern void ax25_start_heartbeat(ax25_cb *);
extern void ax25_start_t1timer(ax25_cb *);
extern void ax25_start_t2timer(ax25_cb *);