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, 8 Feb 2010 23:35:56 +0000 (15:35 -0800)
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 25692bc0a3423bb78058a9bde2b8e2479eee5b3e..f224b2db0249d78a10bb5e0b940620e83a05aba3 100644 (file)
@@ -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);