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

Commit 6a919082 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: mgmt: Initialize HCI_MGMT flag for any command 



The read_controller_info is typically the first command that user space
sends when taking a controller into use. This is also the reason why
this command has been used as the trigger to set the HCI_MGMT flag.
However, when not running the user-space daemon and using command line
tools it is possible that read_controller_info is not the first
controller specific command. This patch moves the HCI_MGMT
initialization to a generic place where it will be set for whatever
happens to be the first mgmt command targetting a specific controller.

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

net/bluetooth/mgmt.c

+6 −4
Original line number Diff line number Diff line
@@ -610,8 +610,11 @@ static void service_cache_off(struct work_struct *work) 
	hci_dev_unlock(hdev);

}



static void mgmt_init_hdev(struct hci_dev *hdev)

static void mgmt_init_hdev(struct sock *sk, struct hci_dev *hdev)

{

	if (!test_and_clear_bit(HCI_PI_MGMT_INIT, &hci_pi(sk)->flags))

		return;



	if (!test_and_set_bit(HCI_MGMT, &hdev->dev_flags)) {

		INIT_DELAYED_WORK(&hdev->service_cache, service_cache_off);
@@ -632,9 +635,6 @@ static int read_controller_info(struct sock *sk, struct hci_dev *hdev) 


	hci_dev_lock(hdev);



	if (test_and_clear_bit(HCI_PI_MGMT_INIT, &hci_pi(sk)->flags))

		mgmt_init_hdev(hdev);



	memset(&rp, 0, sizeof(rp));



	bacpy(&rp.bdaddr, &hdev->bdaddr);
@@ -2764,6 +2764,8 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) 
						MGMT_STATUS_INVALID_PARAMS);

			goto done;

		}



		mgmt_init_hdev(sk, hdev);

	}



	cp = buf + sizeof(*hdr);