aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Stearn2015-07-13 11:38:24 +0200
committerDavid S. Miller2015-07-15 15:59:58 -0700
commitda278622bf04f8ddb14519a2b8214e108ef26101 (patch)
treee74308e2eb04a410fd18fef51aab127c182d04e9
parent738ac1ebb96d02e0d23bc320302a6ea94c612dec (diff)
NET: AX.25: Stop heartbeat timer on disconnect.
This may result in a kernel panic. The bug has always existed but somehow we've run out of luck now and it bites. Signed-off-by: Richard Stearn <richard@rns-stearn.demon.co.uk> Cc: stable@vger.kernel.org # all branches Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ax25/ax25_subr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index 1997538a5d23..3b78e8473a01 100644
--- a/net/ax25/ax25_subr.c
+++ b/net/ax25/ax25_subr.c
@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
{
ax25_clear_queues(ax25);
+ ax25_stop_heartbeat(ax25);
ax25_stop_t1timer(ax25);
ax25_stop_t2timer(ax25);
ax25_stop_t3timer(ax25);