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~4090^2~837 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ffca540514ed34e180c529fd4c4cbb9cbf338109;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 ca957d34b0c8..0c77476d33d2 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -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();