diff options
| author | Vishal Agarwal <vishal.agarwal@stericsson.com> | 2012-06-13 05:32:43 +0530 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-14 12:19:39 -0300 |
| commit | f960727e6c98a36018029c0512aa03f1c5faa914 (patch) | |
| tree | 9add38bcc0b7d783dccc365e6636480a862165f0 /net | |
| parent | 6c4ae5c2e7bfbb7d10d73611f69ac8a8609d84fd (diff) | |
| download | linux-3.10-f960727e6c98a36018029c0512aa03f1c5faa914.tar.gz linux-3.10-f960727e6c98a36018029c0512aa03f1c5faa914.tar.bz2 linux-3.10-f960727e6c98a36018029c0512aa03f1c5faa914.zip | |
Bluetooth: Fix sending HCI_Disconnect only when connected
HCI_Disconnect should only be sent after connection is established.
If connection is not yet established and HCI_Disconnect is called
then disconnection complete will be received with a handle which
does not exist and hence this event will be ignored.
But as mgmt.c will not receive this event, its variable for pending
command is not cleared.This will result in future Disconnect commands
for that BD Address to be blocked with error busy.
Signed-off-by: Vishal Agarwal <vishal.agarwal@stericsson.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 991d5b66767..3e5e3362ea0 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1598,7 +1598,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, else conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr); - if (!conn) { + if (!conn || conn->state == BT_OPEN || conn->state == BT_CLOSED) { err = cmd_status(sk, hdev->id, MGMT_OP_DISCONNECT, MGMT_STATUS_NOT_CONNECTED); goto failed; |