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

This reverts commit e2139b32726e5dd184974c785ea3f62026590801.

Change-Id: Id948d5860840aaf85eca7d8894a7bb3192f0bb47
Signed-off-by: Nick Pelly <npelly@google.com>

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index dac41ad6fc3dc27577a1eeea446cf7d3871f4df2..b29d4ca178ffad221f1c92827f51ebb4189dc390 100644 (file)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1203,8 +1203,6 @@ 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);