From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:26:34 +0000 (+0800)
Subject: Revert "Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP""
X-Git-Tag: firefly_0821_release~9991
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ca8449fb88b7e3a9bc6cec835bbf8b001cbc6f5;p=firefly-linux-kernel-4.4.55.git

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 77d76e6d999f..e105d36f01a7 100755
--- 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);