korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 00:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Directly close dlc for not yet started RFCOMM session

Browse Source 
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: Peter Hurley <peter@hurleysoftware.com>
Tested-By: Alexander Holler <holler@ahsoftware.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Peter Hurley 2014-02-09 20:59:14 -05:00 committed by Marcel Holtmann
parent f622357a5e
commit c4fd318d6e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/bluetooth/rfcomm/core.c
View File

@ -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);