From: Nick Pelly <npelly@google.com>
Date: Thu, 9 Jul 2009 19:23:44 +0000 (-0700)
Subject: Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG.
X-Git-Tag: firefly_0821_release~11675
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a4424765e8daaf56a2d8a0e0ab9dfcf859879fa;p=firefly-linux-kernel-4.4.55.git

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

This fixes a bug where shutdown() and close() on a rfcomm socket during ACL
connection would not cause HCI Create Connection Cancel.

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

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 25692bc0a342..f224b2db0249 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -459,7 +459,6 @@ 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);