Skip to contentSkip to conversation

Bluetooth: Move hci_update_page_scan to hci_request.c

PATCH In review Johan Hedberg 2 participants 2 messages Dec 19, 2014

Subsystems (2)
Bluetooth drivers Bluetooth
lore
Share & tools
lore

Johan Hedberg

author
#0 lore raw

PATCH 1/1 Bluetooth: Move hci_update_page_scan to hci_request.c

From: Johan Hedberg <[email protected]>

This is a left-over from the patch that created hci_request.c. The hci_update_page_scan functions should have been moved from hci_core.c there.

Signed-off-by Johan Hedberg <[email protected]>
---
 net/bluetooth/hci_core.c    | 56 ---------------------------------------------
 net/bluetooth/hci_request.c | 56 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 56 deletions(-)
net/bluetooth/hci_core.c +0 -56
index ee2096c7ec2c..9790a0108e69 100644
@@ -5253,59 +5253,3 @@ static void hci_cmd_work(struct work_struct *work)
 		}
 	}
 }
-
-static bool disconnected_whitelist_entries(struct hci_dev *hdev)
-{
-	struct bdaddr_list *b;
-
-	list_for_each_entry(b, &hdev->whitelist, list) {
-		struct hci_conn *conn;
-
-		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &b->bdaddr);
-		if (!conn)
-			return true;
-
-		if (conn->state != BT_CONNECTED && conn->state != BT_CONFIG)
-			return true;
-	}
-
-	return false;
-}
-
-void __hci_update_page_scan(struct hci_request *req)
-{
-	struct hci_dev *hdev = req->hdev;
-	u8 scan;
-
-	if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags))
-		return;
-
-	if (!hdev_is_powered(hdev))
-		return;
-
-	if (mgmt_powering_down(hdev))
-		return;
-
-	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) ||
-	    disconnected_whitelist_entries(hdev))
-		scan = SCAN_PAGE;
-	else
-		scan = SCAN_DISABLED;
-
-	if (test_bit(HCI_PSCAN, &hdev->flags) == !!(scan & SCAN_PAGE))
-		return;
-
-	if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
-		scan |= SCAN_INQUIRY;
-
-	hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
-}
-
-void hci_update_page_scan(struct hci_dev *hdev)
-{
-	struct hci_request req;
-
-	hci_req_init(&req, hdev);
-	__hci_update_page_scan(&req);
-	hci_req_run(&req, NULL);
-}
net/bluetooth/hci_request.c +56 -0

62 lines not on this page · raw message

Signature · 1 line
2.1.0
maintainer
#1 lore raw

Hi Johan,

Quoted 9 lines

This is a left-over from the patch that created hci_request.c. The hci_update_page_scan functions should have been moved from hci_core.c there.

Signed-off-by Johan Hedberg <[email protected]>

---
net/bluetooth/hci_core.c | 56 ---------------------------------------------
net/bluetooth/hci_request.c | 56 +++++++++++++++++++++++++++++++++++++++++++++

2 files changed, 56 insertions(+), 56 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel