diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /net/ax25/ax25_subr.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'net/ax25/ax25_subr.c')
| -rw-r--r-- | net/ax25/ax25_subr.c | 1 |
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) | |||
| 264 | { | 264 | { |
| 265 | ax25_clear_queues(ax25); | 265 | ax25_clear_queues(ax25); |
| 266 | 266 | ||
| 267 | ax25_stop_heartbeat(ax25); | ||
| 267 | ax25_stop_t1timer(ax25); | 268 | ax25_stop_t1timer(ax25); |
| 268 | ax25_stop_t2timer(ax25); | 269 | ax25_stop_t2timer(ax25); |
| 269 | ax25_stop_t3timer(ax25); | 270 | ax25_stop_t3timer(ax25); |