GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-20 22:15:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: Add support connectable advertising setting

Browse source 
The patch adds a second advertising setting that allows switching of the
controller into connectable mode independent of the global connectable
setting.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2015-03-12 22:30:58 -07:00 • committed by Johan Hedberg
parent 983f9814c0
commit cc91cb042c
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/bluetooth/hci.h
View file

@ -217,6 +217,7 @@ enum {
HCI_HS_ENABLED, HCI_HS_ENABLED,
HCI_LE_ENABLED, HCI_LE_ENABLED,
HCI_ADVERTISING, HCI_ADVERTISING,
HCI_ADVERTISING_CONNECTABLE,
HCI_CONNECTABLE, HCI_CONNECTABLE,
HCI_DISCOVERABLE, HCI_DISCOVERABLE,
HCI_LIMITED_DISCOVERABLE, HCI_LIMITED_DISCOVERABLE,

37
net/bluetooth/mgmt.c
View file

@ -1110,6 +1110,9 @@ static void enable_advertising(struct hci_request *req)
*/ */
clear_bit(HCI_LE_ADV, &hdev->dev_flags); clear_bit(HCI_LE_ADV, &hdev->dev_flags);
if (test_bit(HCI_ADVERTISING_CONNECTABLE, &hdev->dev_flags))
connectable = true;
else
connectable = get_connectable(hdev); connectable = get_connectable(hdev);
/* Set require_privacy to true only when non-connectable /* Set require_privacy to true only when non-connectable
@ -4430,7 +4433,7 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,
struct mgmt_mode *cp = data; struct mgmt_mode *cp = data;
struct mgmt_pending_cmd *cmd; struct mgmt_pending_cmd *cmd;
struct hci_request req; struct hci_request req;
u8 val, enabled, status; u8 val, status;
int err; int err;
BT_DBG("request for %s", hdev->name); BT_DBG("request for %s", hdev->name);
@ -4440,29 +4443,42 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,
return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_ADVERTISING, return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_ADVERTISING,
status); status);
if (cp->val != 0x00 && cp->val != 0x01) if (cp->val != 0x00 && cp->val != 0x01 && cp->val != 0x02)
return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_ADVERTISING, return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_ADVERTISING,
MGMT_STATUS_INVALID_PARAMS); MGMT_STATUS_INVALID_PARAMS);
hci_dev_lock(hdev); hci_dev_lock(hdev);
val = !!cp->val; val = !!cp->val;
enabled = test_bit(HCI_ADVERTISING, &hdev->dev_flags);
/* The following conditions are ones which mean that we should /* The following conditions are ones which mean that we should
* not do any HCI communication but directly send a mgmt * not do any HCI communication but directly send a mgmt
* response to user space (after toggling the flag if * response to user space (after toggling the flag if
* necessary). * necessary).
*/ */
if (!hdev_is_powered(hdev) || val == enabled || if (!hdev_is_powered(hdev) ||
(val == test_bit(HCI_ADVERTISING, &hdev->dev_flags) &&
(cp->val == 0x02) == test_bit(HCI_ADVERTISING_CONNECTABLE,
&hdev->dev_flags)) ||
hci_conn_num(hdev, LE_LINK) > 0 || hci_conn_num(hdev, LE_LINK) > 0 ||
(test_bit(HCI_LE_SCAN, &hdev->dev_flags) && (test_bit(HCI_LE_SCAN, &hdev->dev_flags) &&
hdev->le_scan_type == LE_SCAN_ACTIVE)) { hdev->le_scan_type == LE_SCAN_ACTIVE)) {
bool changed = false; bool changed;
if (val != test_bit(HCI_ADVERTISING, &hdev->dev_flags)) { if (cp->val) {
change_bit(HCI_ADVERTISING, &hdev->dev_flags); changed = !test_and_set_bit(HCI_ADVERTISING,
changed = true; &hdev->dev_flags);
if (cp->val == 0x02)
set_bit(HCI_ADVERTISING_CONNECTABLE,
&hdev->dev_flags);
else
clear_bit(HCI_ADVERTISING_CONNECTABLE,
&hdev->dev_flags);
} else {
changed = test_and_clear_bit(HCI_ADVERTISING,
&hdev->dev_flags);
clear_bit(HCI_ADVERTISING_CONNECTABLE,
&hdev->dev_flags);
} }
err = send_settings_rsp(sk, MGMT_OP_SET_ADVERTISING, hdev); err = send_settings_rsp(sk, MGMT_OP_SET_ADVERTISING, hdev);
@ -4490,6 +4506,11 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,
hci_req_init(&req, hdev); hci_req_init(&req, hdev);
if (cp->val == 0x02)
set_bit(HCI_ADVERTISING_CONNECTABLE, &hdev->dev_flags);
else
clear_bit(HCI_ADVERTISING_CONNECTABLE, &hdev->dev_flags);
if (val) if (val)
enable_advertising(&req); enable_advertising(&req);
else else