leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Fix clearing and restarting all LE actions on power cycle

Browse Source 
When powering off (hci_dev_do_close) we should clear both the
pend_le_reports and pend_le_conns types of entries. When powering on
respectively we should populate both lists. This patch converts the
hci_pend_le_conns_clear() function into hci_pend_le_actions_clear()
(which can now be static) and converts the restart_le_auto_conns()
function into restart_le_actions().

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-07-04 12:37:23 +03:00 committed by Marcel Holtmann
parent ae44e5d19e
commit d7347f3cc2
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/bluetooth/hci_core.h
View File

@ -871,7 +871,6 @@ void hci_conn_params_clear_enabled(struct hci_dev *hdev);
struct hci_conn_params *hci_pend_le_conn_lookup(struct hci_dev *hdev, struct hci_conn_params *hci_pend_le_conn_lookup(struct hci_dev *hdev,
bdaddr_t *addr, u8 addr_type); bdaddr_t *addr, u8 addr_type);
void hci_pend_le_conn_add(struct hci_dev *hdev, struct hci_conn_params *params); void hci_pend_le_conn_add(struct hci_dev *hdev, struct hci_conn_params *params);
void hci_pend_le_conns_clear(struct hci_dev *hdev);
void hci_update_background_scan(struct hci_dev *hdev); void hci_update_background_scan(struct hci_dev *hdev);

23
net/bluetooth/hci_core.c
View File

@ -2354,6 +2354,17 @@ done:
return err; return err;
} }
/* This function requires the caller holds hdev->lock */
static void hci_pend_le_actions_clear(struct hci_dev *hdev)
{
struct hci_conn_params *p;
list_for_each_entry(p, &hdev->le_conn_params, list)
list_del_init(&p->action);
BT_DBG("All LE pending actions cleared");
}
static int hci_dev_do_close(struct hci_dev *hdev) static int hci_dev_do_close(struct hci_dev *hdev)
{ {
BT_DBG("%s %p", hdev->name, hdev); BT_DBG("%s %p", hdev->name, hdev);
@ -2391,7 +2402,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
hci_dev_lock(hdev); hci_dev_lock(hdev);
hci_inquiry_cache_flush(hdev); hci_inquiry_cache_flush(hdev);
hci_conn_hash_flush(hdev); hci_conn_hash_flush(hdev);
hci_pend_le_conns_clear(hdev); hci_pend_le_actions_clear(hdev);
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
hci_notify(hdev, HCI_DEV_DOWN); hci_notify(hdev, HCI_DEV_DOWN);
@ -3460,16 +3471,6 @@ void hci_pend_le_conn_add(struct hci_dev *hdev, struct hci_conn_params *params)
hci_update_background_scan(hdev); hci_update_background_scan(hdev);
} }
/* This function requires the caller holds hdev->lock */
void hci_pend_le_conns_clear(struct hci_dev *hdev)
{
while (!list_empty(&hdev->pend_le_conns))
list_del_init(hdev->pend_le_conns.next);
BT_DBG("All LE pending connections cleared");
}
/* This function requires the caller holds hdev->lock */
struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev, struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev,
bdaddr_t *addr, u8 addr_type) bdaddr_t *addr, u8 addr_type)
{ {

33
net/bluetooth/mgmt.c
View File

@ -5533,29 +5533,28 @@ void mgmt_index_removed(struct hci_dev *hdev)
} }
/* This function requires the caller holds hdev->lock */ /* This function requires the caller holds hdev->lock */
static void restart_le_auto_conns(struct hci_dev *hdev) static void restart_le_actions(struct hci_dev *hdev)
{ {
struct hci_conn_params *p; struct hci_conn_params *p;
bool added = false;
list_for_each_entry(p, &hdev->le_conn_params, list) { list_for_each_entry(p, &hdev->le_conn_params, list) {
if (p->auto_connect == HCI_AUTO_CONN_ALWAYS) { /* Needed for AUTO_OFF case where might not "really"
hci_pend_le_conn_add(hdev, p); * have been powered off.
added = true; */
list_del_init(&p->action);
switch (p->auto_connect) {
case HCI_AUTO_CONN_ALWAYS:
list_add(&p->action, &hdev->pend_le_conns);
break;
case HCI_AUTO_CONN_REPORT:
list_add(&p->action, &hdev->pend_le_reports);
break;
default:
break;
} }
} }
/* Calling hci_pend_le_conn_add will actually already trigger
* background scanning when needed. So no need to trigger it
* just another time.
*
* This check is here to avoid an unneeded restart of the
* passive scanning. Since this is during the controller
* power up phase the duplicate filtering is not an issue.
*/
if (added)
return;
hci_update_background_scan(hdev); hci_update_background_scan(hdev);
} }
@ -5567,7 +5566,7 @@ static void powered_complete(struct hci_dev *hdev, u8 status)
hci_dev_lock(hdev); hci_dev_lock(hdev);
restart_le_auto_conns(hdev); restart_le_actions(hdev);
mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match); mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);