Commit 13ecd8b6 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Move non-critical sections outside of the dev lock 



This patch fixes sections of code that do not need hci_lock_dev to be
outside of the lock. Such sections include code that do not touch the
hdev at all as well as sections which just read a single byte from the
supported_features value (i.e. all lmp_*_capable() macros).

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent ee98f473

net/bluetooth/mgmt.c

+18 −28
Original line number Diff line number Diff line
@@ -1133,13 +1133,11 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 


	BT_DBG("request for %s", hdev->name);



	hci_dev_lock(hdev);



	if (!lmp_ssp_capable(hdev)) {

		err = cmd_status(sk, hdev->id, MGMT_OP_SET_SSP,

	if (!lmp_ssp_capable(hdev))

		return cmd_status(sk, hdev->id, MGMT_OP_SET_SSP,

				  MGMT_STATUS_NOT_SUPPORTED);

		goto failed;

	}



	hci_dev_lock(hdev);



	val = !!cp->val;
@@ -1217,13 +1215,11 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 


	BT_DBG("request for %s", hdev->name);



	hci_dev_lock(hdev);



	if (!lmp_le_capable(hdev)) {

		err = cmd_status(sk, hdev->id, MGMT_OP_SET_LE,

	if (!lmp_le_capable(hdev))

		return cmd_status(sk, hdev->id, MGMT_OP_SET_LE,

				  MGMT_STATUS_NOT_SUPPORTED);

		goto unlock;

	}



	hci_dev_lock(hdev);



	val = !!cp->val;

	enabled = lmp_host_le_capable(hdev);
@@ -1422,25 +1418,19 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data, 


	BT_DBG("request for %s", hdev->name);



	hci_dev_lock(hdev);



	if (!lmp_bredr_capable(hdev)) {

		err = cmd_status(sk, hdev->id, MGMT_OP_SET_DEV_CLASS,

	if (!lmp_bredr_capable(hdev))

		return cmd_status(sk, hdev->id, MGMT_OP_SET_DEV_CLASS,

				  MGMT_STATUS_NOT_SUPPORTED);

		goto unlock;

	}



	if (test_bit(HCI_PENDING_CLASS, &hdev->dev_flags)) {

		err = cmd_status(sk, hdev->id, MGMT_OP_SET_DEV_CLASS,

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

		return cmd_status(sk, hdev->id, MGMT_OP_SET_DEV_CLASS,

				  MGMT_STATUS_BUSY);

		goto unlock;

	}



	if ((cp->minor & 0x03) != 0 || (cp->major & 0xe0) != 0) {

		err = cmd_status(sk, hdev->id, MGMT_OP_SET_DEV_CLASS,

	if ((cp->minor & 0x03) != 0 || (cp->major & 0xe0) != 0)

		return cmd_status(sk, hdev->id, MGMT_OP_SET_DEV_CLASS,

				  MGMT_STATUS_INVALID_PARAMS);

		goto unlock;

	}



	hci_dev_lock(hdev);



	hdev->major_class = cp->major;

	hdev->minor_class = cp->minor;

CRA Git | Maintained and supported by SUSTech CRA and CCSE