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>
Tue, 14 Jun 2011 16:09:16 +0000 (09:09 -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 5759bb7054f7f4aca8822271b7de4da8997af915..8c2e79672d9b3df4a91a0c745db99a451b6a885d 100644 (file)
@@ -466,7 +466,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();