Revert "Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP""

This reverts commit 33a3a31ffafc73c537e4a99c99da766863cc9d41.

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 77d76e6d999f62792df4de3e9fff113125b7e911..e105d36f01a7afaff69731e710f75e3bb55f0968 100755 (executable)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1194,6 +1194,8 @@ void rfcomm_dlc_accept(struct rfcomm_dlc *d)
 
        rfcomm_send_ua(d->session, d->dlci);
 
+       rfcomm_dlc_clear_timer(d);
+
        rfcomm_dlc_lock(d);
        d->state = BT_CONNECTED;
        d->state_change(d, 0);