Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67e5a7a3 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Move set_bredr_scan() to avoid forward declaration 



The set_bredr_scan() function will soon be needed by the set_bredr()
function, so move it to a new location to avoid having to add a forward
declaration.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 1987fdc7

net/bluetooth/mgmt.c

+20 −20
Original line number Diff line number Diff line
@@ -3558,6 +3558,26 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev, 
	return err;

}



static void set_bredr_scan(struct hci_request *req)

{

	struct hci_dev *hdev = req->hdev;

	u8 scan = 0;



	/* Ensure that fast connectable is disabled. This function will

	 * not do anything if the page scan parameters are already what

	 * they should be.

	 */

	write_fast_connectable(req, false);



	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))

		scan |= SCAN_PAGE;

	if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))

		scan |= SCAN_INQUIRY;



	if (scan)

		hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);

}



static void set_bredr_complete(struct hci_dev *hdev, u8 status)

{

	struct pending_cmd *cmd;
@@ -3917,26 +3937,6 @@ void mgmt_index_removed(struct hci_dev *hdev) 
	mgmt_event(MGMT_EV_INDEX_REMOVED, hdev, NULL, 0, NULL);

}



static void set_bredr_scan(struct hci_request *req)

{

	struct hci_dev *hdev = req->hdev;

	u8 scan = 0;



	/* Ensure that fast connectable is disabled. This function will

	 * not do anything if the page scan parameters are already what

	 * they should be.

	 */

	write_fast_connectable(req, false);



	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))

		scan |= SCAN_PAGE;

	if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))

		scan |= SCAN_INQUIRY;



	if (scan)

		hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);

}



static void powered_complete(struct hci_dev *hdev, u8 status)

{

	struct cmd_lookup match = { NULL, hdev };