summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2011-11-08 00:16:03 +0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-08 18:54:10 +0400
commit2d7cee5836d6d466829b255b1290c9386d4e884f (patch)
treee87b27c8fa32226f7368c9f01329696c30d3d39c /net/bluetooth
parent16ab91ab48287aa4fc757f3618820f728ee4412f (diff)
downloadlinux-2d7cee5836d6d466829b255b1290c9386d4e884f.tar.xz
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c9
-rw-r--r--net/bluetooth/mgmt.c13
2 files changed, 19 insertions, 3 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index cf9926565937..176cecae4b42 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 724d4fee2bd7..0cb023e0edb4 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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;