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)
committerArve Hjønnevåg <arve@android.com>
Mon, 1 Jul 2013 20:40:27 +0000 (13:40 -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 ca957d34b0c89fa29341a179ee16e325ac226e55..0c77476d33d2043f388da49a7fe8545418760e96 100644 (file)
@@ -436,7 +436,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();