dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Bluetooth: Fix mgmt response when HCI_Write_Scan_Enable fails 

A proper mgmt_command_status should be returned to user-space if either
discoverable or connectable enabling fails.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Johan Hedberg 2011-11-07 22:16:03 +02:00 committed by Gustavo F. Padovan
parent 16ab91ab48
commit 2d7cee5836
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/bluetooth/hci_core.h
View File

@ -911,6 +911,7 @@ int mgmt_index_removed(u16 index);
int mgmt_powered(u16 index, u8 powered);
int mgmt_discoverable(u16 index, u8 discoverable);
int mgmt_connectable(u16 index, u8 connectable);
int mgmt_write_scan_failed(u16 index, u8 scan, u8 status);
int mgmt_new_key(u16 index, struct link_key *key, u8 persistent);
int mgmt_connected(u16 index, bdaddr_t *bdaddr, u8 link_type);
int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);

9
net/bluetooth/hci_event.c
View File

@ -280,11 +280,14 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
if (!sent)
return;
if (status != 0)
goto done;
param = *((__u8 *) sent);
if (status != 0) {
mgmt_write_scan_failed(hdev->id, param, status);
hdev->discov_timeout = 0;
goto done;
}
old_pscan = test_and_clear_bit(HCI_PSCAN, &hdev->flags);
old_iscan = test_and_clear_bit(HCI_ISCAN, &hdev->flags);

13
net/bluetooth/mgmt.c
View File

@ -2056,6 +2056,19 @@ int mgmt_connectable(u16 index, u8 connectable)
return ret;
}
int mgmt_write_scan_failed(u16 index, u8 scan, u8 status)
{
if (scan & SCAN_PAGE)
mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, index,
cmd_status_rsp, &status);
if (scan & SCAN_INQUIRY)
mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, index,
cmd_status_rsp, &status);
return 0;
}
int mgmt_new_key(u16 index, struct link_key *key, u8 persistent)
{
struct mgmt_ev_new_key ev;