UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: mgmt: Fix clear_uuids response 

Since the clear_uuids operation doesn't send an immediate HCI command
but just sets off a timer to wait for subsequent add_uuid calls it
doesn't make sense to wait until the timer fires off to send the
response. Instead send the response immediately.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2012-02-23 23:24:30 +02:00
parent 90e704543d
commit 24b78d0f49
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/bluetooth/mgmt.c
View File

@ -1394,6 +1394,20 @@ failed:
return err; return err;
} }
static bool enable_service_cache(struct hci_dev *hdev)
{
if (!hdev_is_powered(hdev))
return false;
if (!test_and_set_bit(HCI_SERVICE_CACHE, &hdev->dev_flags)) {
schedule_delayed_work(&hdev->service_cache,
msecs_to_jiffies(SERVICE_CACHE_TIMEOUT));
return true;
}
return false;
}
static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len) static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
{ {
struct mgmt_cp_remove_uuid *cp = data; struct mgmt_cp_remove_uuid *cp = data;
@ -1425,10 +1439,11 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
if (memcmp(cp->uuid, bt_uuid_any, 16) == 0) { if (memcmp(cp->uuid, bt_uuid_any, 16) == 0) {
err = hci_uuids_clear(hdev); err = hci_uuids_clear(hdev);
if (hdev_is_powered(hdev) && if (enable_service_cache(hdev)) {
!test_and_set_bit(HCI_SERVICE_CACHE, &hdev->dev_flags)) err = cmd_complete(sk, index, MGMT_OP_REMOVE_UUID, 0,
schedule_delayed_work(&hdev->service_cache, hdev->dev_class, 3);
msecs_to_jiffies(SERVICE_CACHE_TIMEOUT)); goto unlock;
}
goto update_class; goto update_class;
} }