提交 d7b856f9 编写于 作者: J Johan Hedberg 提交者: Marcel Holtmann

Bluetooth: Move more logic into set_connectable complete callback

This patch moves the responsibility of setting/clearing the
HCI_CONNECTABLE flag to the request completion callback of the Set
Connectable command. This will allow us to cleanly add support for LE
Advertising hooks in later patches.
Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
上级 9b74246f
...@@ -1075,6 +1075,8 @@ static void write_fast_connectable(struct hci_request *req, bool enable) ...@@ -1075,6 +1075,8 @@ static void write_fast_connectable(struct hci_request *req, bool enable)
static void set_connectable_complete(struct hci_dev *hdev, u8 status) static void set_connectable_complete(struct hci_dev *hdev, u8 status)
{ {
struct pending_cmd *cmd; struct pending_cmd *cmd;
struct mgmt_mode *cp;
bool changed;
BT_DBG("status 0x%02x", status); BT_DBG("status 0x%02x", status);
...@@ -1084,8 +1086,17 @@ static void set_connectable_complete(struct hci_dev *hdev, u8 status) ...@@ -1084,8 +1086,17 @@ static void set_connectable_complete(struct hci_dev *hdev, u8 status)
if (!cmd) if (!cmd)
goto unlock; goto unlock;
cp = cmd->param;
if (cp->val)
changed = !test_and_set_bit(HCI_CONNECTABLE, &hdev->dev_flags);
else
changed = test_and_clear_bit(HCI_CONNECTABLE, &hdev->dev_flags);
send_settings_rsp(cmd->sk, MGMT_OP_SET_CONNECTABLE, hdev); send_settings_rsp(cmd->sk, MGMT_OP_SET_CONNECTABLE, hdev);
if (changed)
new_settings(hdev, cmd->sk);
mgmt_pending_remove(cmd); mgmt_pending_remove(cmd);
unlock: unlock:
...@@ -4053,10 +4064,16 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable) ...@@ -4053,10 +4064,16 @@ 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)
{ {
struct pending_cmd *cmd;
bool changed = false; bool changed = false;
int err = 0; int err = 0;
/* Nothing needed here if there's a pending command since that
* commands request completion callback takes care of everything
* necessary.
*/
if (mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, hdev))
return 0;
if (connectable) { if (connectable) {
if (!test_and_set_bit(HCI_CONNECTABLE, &hdev->dev_flags)) if (!test_and_set_bit(HCI_CONNECTABLE, &hdev->dev_flags))
changed = true; changed = true;
...@@ -4065,10 +4082,8 @@ int mgmt_connectable(struct hci_dev *hdev, u8 connectable) ...@@ -4065,10 +4082,8 @@ int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
changed = true; changed = true;
} }
cmd = mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, hdev);
if (changed) if (changed)
err = new_settings(hdev, cmd ? cmd->sk : NULL); err = new_settings(hdev, NULL);
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册