From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:41:07 +0000 (+0800)
Subject: Revert "Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG."
X-Git-Tag: firefly_0821_release~9951
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=09f686b243c57ea9e9c9c126da8805d1257d0f6d;p=firefly-linux-kernel-4.4.55.git

Revert "Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG."

This reverts commit 8a4424765e8daaf56a2d8a0e0ab9dfcf859879fa.
---

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index f224b2db0249..25692bc0a342 100755
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -459,6 +459,7 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)
 
 	switch (d->state) {
 	case BT_CONNECT:
+	case BT_CONFIG:
 		if (test_and_clear_bit(RFCOMM_DEFER_SETUP, &d->flags)) {
 			set_bit(RFCOMM_AUTH_REJECT, &d->flags);
 			rfcomm_schedule(RFCOMM_SCHED_AUTH);