Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG.
authorNick Pelly <npelly@google.com>
Thu, 9 Jul 2009 19:23:44 +0000 (12:23 -0700)
committerColin Cross <ccross@android.com>
Thu, 30 Sep 2010 00:49:23 +0000 (17:49 -0700)
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>
net/bluetooth/rfcomm/core.c

index 7dca91bb8c576397e571994655efbe9d1832d7b6..1d786425511bfa28b084187f2cc940679beebd54 100644 (file)
@@ -462,7 +462,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);