aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-04 05:37:18 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-04 05:58:08 -0400
commit66f8455aeac3427110d451534567eb1b9aea6929 (patch)
tree23116c8f24bcf1ee2488ac71b1d615b13cf3f16f /net/bluetooth/mgmt.c
parent93450c75448e370659ce7ca9c192298596fb055e (diff)
Bluetooth: Convert pend_le_reports into a list
To simplify manipulation and lookup of hci_conn_params entries of the type HCI_AUTO_CONN_REPORT it makes sense to store them in their own list. The new action list_head in hci_conn_params is used for this purpose. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 474b6dcdf665..a823cccf81f1 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -5226,7 +5226,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
5226 } 5226 }
5227 5227
5228 if (params->auto_connect == HCI_AUTO_CONN_REPORT) 5228 if (params->auto_connect == HCI_AUTO_CONN_REPORT)
5229 hdev->pend_le_reports--; 5229 list_del_init(&params->action);
5230 5230
5231 hci_pend_le_conn_del(hdev, params); 5231 hci_pend_le_conn_del(hdev, params);
5232 list_del(&params->list); 5232 list_del(&params->list);
@@ -6540,7 +6540,7 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
6540 if (!hci_discovery_active(hdev)) { 6540 if (!hci_discovery_active(hdev)) {
6541 if (link_type == ACL_LINK) 6541 if (link_type == ACL_LINK)
6542 return; 6542 return;
6543 if (link_type == LE_LINK && !hdev->pend_le_reports) 6543 if (link_type == LE_LINK && list_empty(&hdev->pend_le_reports))
6544 return; 6544 return;
6545 } 6545 }
6546 6546