[PATCH 3.4 030/107] NET: AX.25: Stop heartbeat timer on disconnect.

lizf
2016-03-16T08:09:03Z

From: Richard Stearn <richard@rns-stearn.demon.co.uk>

3.4.111-rc1 review patch. If anyone has any objections, please let me know.

------------------

commit da278622bf04f8ddb14519a2b8214e108ef26101 upstream.

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>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Zefan Li <lizefan@huawei.com>
---
net/ax25/ax25_subr.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index 1997538..3b78e84 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);
--
1.9.1