diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-02-09 20:59:14 -0500 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-02-14 13:39:31 -0800 |
| commit | c4fd318d6ebc16bd64ca7b9c06f21b7f33bb462e (patch) | |
| tree | 153985cd051ba3cae45b18158bce3fac0918a73f /net/bluetooth/rfcomm | |
| parent | f622357a5e83e3a812ca985a78e86d750c98228b (diff) | |
| download | linux-c4fd318d6ebc16bd64ca7b9c06f21b7f33bb462e.tar.gz linux-c4fd318d6ebc16bd64ca7b9c06f21b7f33bb462e.tar.bz2 linux-c4fd318d6ebc16bd64ca7b9c06f21b7f33bb462e.zip | |
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: Peter Hurley <peter@hurleysoftware.com>
Tested-By: Alexander Holler <holler@ahsoftware.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/rfcomm')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 5acc82fa0200..b727cd97c5a2 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -468,13 +468,19 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) switch (d->state) { case BT_CONNECT: - case BT_CONFIG: - /* Fall through */ - case BT_CONNECTED: __rfcomm_dlc_disconn(d); 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: rfcomm_dlc_clear_timer(d); |