From: Nick Pelly <npelly@google.com>
Date: Wed, 24 Feb 2010 17:29:10 +0000 (-0800)
Subject: Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP"
X-Git-Tag: firefly_0821_release~9833^2~5^2~230
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b297a5aab0ebfe39ab08d6b28cf73dd35adecca3;p=firefly-linux-kernel-4.4.55.git

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 dac41ad6fc3d..b29d4ca178ff 100644
--- 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);