AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Bluetooth: mgmt: Allow connectable/discoverable changes in off state

Browse Source 
This patch makes it possible to toggle the connectable & discoverable
settings when powered off. Two new hdev->dev_flags flags are added to
track what the scan mode should be when the device is finally powered
on.

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-21 16:01:30 +02:00
parent 0cbf4ed6e6
commit 5e5282bbfd
3 changed files with 76 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/hci.h
View File

@ -96,6 +96,8 @@ enum {
HCI_LE_SCAN, HCI_LE_SCAN,
HCI_SSP_ENABLED, HCI_SSP_ENABLED,
HCI_HS_ENABLED, HCI_HS_ENABLED,
HCI_CONNECTABLE,
HCI_DISCOVERABLE,
}; };
/* HCI ioctl defines */ /* HCI ioctl defines */

1
net/bluetooth/hci_core.c
View File

@ -737,6 +737,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
if (hdev->discov_timeout > 0) { if (hdev->discov_timeout > 0) {
cancel_delayed_work(&hdev->discov_off); cancel_delayed_work(&hdev->discov_off);
hdev->discov_timeout = 0; hdev->discov_timeout = 0;
clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
} }
if (test_and_clear_bit(HCI_SERVICE_CACHE, &hdev->dev_flags)) if (test_and_clear_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))

91
net/bluetooth/mgmt.c
View File

@ -398,10 +398,10 @@ static u32 get_current_settings(struct hci_dev *hdev)
if (!test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) if (!test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
settings |= MGMT_SETTING_POWERED; settings |= MGMT_SETTING_POWERED;
if (test_bit(HCI_PSCAN, &hdev->flags)) if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
settings |= MGMT_SETTING_CONNECTABLE; settings |= MGMT_SETTING_CONNECTABLE;
if (test_bit(HCI_ISCAN, &hdev->flags)) if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
settings |= MGMT_SETTING_DISCOVERABLE; settings |= MGMT_SETTING_DISCOVERABLE;
if (test_bit(HCI_PAIRABLE, &hdev->dev_flags)) if (test_bit(HCI_PAIRABLE, &hdev->dev_flags))
@ -804,6 +804,7 @@ static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
struct mgmt_cp_set_discoverable *cp = data; struct mgmt_cp_set_discoverable *cp = data;
struct hci_dev *hdev; struct hci_dev *hdev;
struct pending_cmd *cmd; struct pending_cmd *cmd;
u16 timeout;
u8 scan; u8 scan;
int err; int err;
@ -818,9 +819,11 @@ static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE,
MGMT_STATUS_INVALID_PARAMS); MGMT_STATUS_INVALID_PARAMS);
timeout = get_unaligned_le16(&cp->timeout);
hci_dev_lock(hdev); hci_dev_lock(hdev);
if (!hdev_is_powered(hdev)) { if (!hdev_is_powered(hdev) && timeout > 0) {
err = cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, err = cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE,
MGMT_STATUS_NOT_POWERED); MGMT_STATUS_NOT_POWERED);
goto failed; goto failed;
@ -833,8 +836,22 @@ static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
goto failed; goto failed;
} }
if (cp->val == test_bit(HCI_ISCAN, &hdev->flags) && if (!test_bit(HCI_CONNECTABLE, &hdev->dev_flags)) {
test_bit(HCI_PSCAN, &hdev->flags)) { err = cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE,
MGMT_STATUS_REJECTED);
goto failed;
}
if (!hdev_is_powered(hdev)) {
if (cp->val)
set_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
else
clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
err = send_settings_rsp(sk, MGMT_OP_SET_DISCOVERABLE, hdev);
goto failed;
}
if (!!cp->val == test_bit(HCI_DISCOVERABLE, &hdev->dev_flags)) {
err = send_settings_rsp(sk, MGMT_OP_SET_DISCOVERABLE, hdev); err = send_settings_rsp(sk, MGMT_OP_SET_DISCOVERABLE, hdev);
goto failed; goto failed;
} }
@ -857,7 +874,7 @@ static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
mgmt_pending_remove(cmd); mgmt_pending_remove(cmd);
if (cp->val) if (cp->val)
hdev->discov_timeout = get_unaligned_le16(&cp->timeout); hdev->discov_timeout = timeout;
failed: failed:
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
@ -888,8 +905,13 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
hci_dev_lock(hdev); hci_dev_lock(hdev);
if (!hdev_is_powered(hdev)) { if (!hdev_is_powered(hdev)) {
err = cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, if (cp->val)
MGMT_STATUS_NOT_POWERED); set_bit(HCI_CONNECTABLE, &hdev->dev_flags);
else {
clear_bit(HCI_CONNECTABLE, &hdev->dev_flags);
clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
}
err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev);
goto failed; goto failed;
} }
@ -900,7 +922,7 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
goto failed; goto failed;
} }
if (cp->val == test_bit(HCI_PSCAN, &hdev->flags)) { if (!!cp->val == test_bit(HCI_PSCAN, &hdev->flags)) {
err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev); err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, hdev);
goto failed; goto failed;
} }
@ -2881,9 +2903,22 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
__le32 ev; __le32 ev;
int err; int err;
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
return 0;
mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match); mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
if (!powered) { if (powered) {
u8 scan = 0;
if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
scan |= SCAN_PAGE;
if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
scan |= SCAN_INQUIRY;
if (scan)
hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
} else {
u8 status = ENETDOWN; u8 status = ENETDOWN;
mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status); mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status);
} }
@ -2902,15 +2937,25 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable) int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
{ {
struct cmd_lookup match = { NULL, hdev }; struct cmd_lookup match = { NULL, hdev };
__le32 ev; bool changed = false;
int err; int err = 0;
mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev, settings_rsp, &match); mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev, settings_rsp, &match);
ev = cpu_to_le32(get_current_settings(hdev)); if (discoverable) {
if (!test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
changed = true;
} else {
if (test_and_clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
changed = true;
}
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), if (changed) {
__le32 ev = cpu_to_le32(get_current_settings(hdev));
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
match.sk); match.sk);
}
if (match.sk) if (match.sk)
sock_put(match.sk); sock_put(match.sk);
@ -2919,16 +2964,26 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
int mgmt_connectable(struct hci_dev *hdev, u8 connectable) int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
{ {
__le32 ev;
struct cmd_lookup match = { NULL, hdev }; struct cmd_lookup match = { NULL, hdev };
int err; bool changed = false;
int err = 0;
mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp, mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp,
&match); &match);
ev = cpu_to_le32(get_current_settings(hdev)); if (connectable) {
if (!test_and_set_bit(HCI_CONNECTABLE, &hdev->dev_flags))
changed = true;
} else {
if (test_and_clear_bit(HCI_CONNECTABLE, &hdev->dev_flags))
changed = true;
}
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk); if (changed) {
__le32 ev = cpu_to_le32(get_current_settings(hdev));
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
match.sk);
}
if (match.sk) if (match.sk)
sock_put(match.sk); sock_put(match.sk);