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

Commit 2f274981 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix BR/EDR Page Scan update with Add Device 



The recent changes to remove dependency on HCI in Add Device missed
out relevant changes for BR/EDR. This patch removes the left-overs and
ensures the right HCI command gets queued for BR/EDR.

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

net/bluetooth/mgmt.c

+1 −13
Original line number Diff line number Diff line
@@ -5894,8 +5894,6 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, 
		      void *data, u16 len)

{

	struct mgmt_cp_add_device *cp = data;

	struct mgmt_pending_cmd *cmd;

	struct hci_request req;

	u8 auto_conn, addr_type;

	int err;
@@ -5912,18 +5910,8 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, 
					 MGMT_STATUS_INVALID_PARAMS,

					 &cp->addr, sizeof(cp->addr));



	hci_req_init(&req, hdev);



	hci_dev_lock(hdev);



	cmd = mgmt_pending_add(sk, MGMT_OP_ADD_DEVICE, hdev, data, len);

	if (!cmd) {

		err = -ENOMEM;

		goto unlock;

	}



	cmd->cmd_complete = addr_cmd_complete;



	if (cp->addr.type == BDADDR_BREDR) {

		/* Only incoming connections action is supported for now */

		if (cp->action != 0x01) {
@@ -5939,7 +5927,7 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, 
		if (err)

			goto unlock;



		__hci_update_page_scan(&req);

		hci_update_page_scan(hdev);



		goto added;

	}