Commit c4fd318d authored by Peter Hurley's avatar Peter Hurley Committed by Marcel Holtmann

Bluetooth: Directly close dlc for not yet started RFCOMM session

If the RFCOMM session has not yet been started (ie., session is
still in BT_BOUND state) when a dlc is closed, directly close and
unlink the dlc rather than sending a DISC frame that is never
sent.

This allows the dlci to be immediately reused rather than waiting
for a 20 second timeout.
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Tested-By: default avatarAlexander Holler <holler@ahsoftware.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f622357a
...@@ -468,13 +468,19 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) ...@@ -468,13 +468,19 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)
switch (d->state) { switch (d->state) {
case BT_CONNECT: case BT_CONNECT:
case BT_CONFIG:
/* Fall through */
case BT_CONNECTED: case BT_CONNECTED:
__rfcomm_dlc_disconn(d); __rfcomm_dlc_disconn(d);
break; break;
case BT_CONFIG:
if (s->state != BT_BOUND) {
__rfcomm_dlc_disconn(d);
break;
}
/* if closing a dlc in a session that hasn't been started,
* just close and unlink the dlc
*/
default: default:
rfcomm_dlc_clear_timer(d); rfcomm_dlc_clear_timer(d);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment