Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
ax25
/
ax25_subr.c
diff --git
a/kernel/net/ax25/ax25_subr.c
b/kernel/net/ax25/ax25_subr.c
index
3b78e84
..
983f0b5
100644
(file)
--- a/
kernel/net/ax25/ax25_subr.c
+++ b/
kernel/net/ax25/ax25_subr.c
@@
-264,7
+264,8
@@
void ax25_disconnect(ax25_cb *ax25, int reason)
{
ax25_clear_queues(ax25);
- ax25_stop_heartbeat(ax25);
+ if (!ax25->sk || !sock_flag(ax25->sk, SOCK_DESTROY))
+ ax25_stop_heartbeat(ax25);
ax25_stop_t1timer(ax25);
ax25_stop_t2timer(ax25);
ax25_stop_t3timer(ax25);