From: Nick Pelly 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~7613^2~769 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1349d4abcad09162ab1a3d8fa5523ee227806c4a;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 --- diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 5759bb7054f7..8c2e79672d9b 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -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();