Commit 94d52dad authored Feb 19, 2015 by Johan Hedberg Committed by Marcel Holtmann Feb 19, 2015

Bluetooth: Remove bogus check for pending mgmt Set HS command



The command handler for Set HS doesn't use mgmt_pending_add() so we can
never have a pending Set HS command that mgmt_pending_find() would
return. This patch removes an unnecessary lookup for it in the set_ssp()
handler function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 3a6d576b

net/bluetooth/mgmt.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2116,8 +2116,7 @@ static int set_ssp(struct sock sk, struct hci_dev hdev, void *data, u16 len)
		goto failed;
		}

		if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev) \|\|
		mgmt_pending_find(MGMT_OP_SET_HS, hdev)) {
		if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) {
		err = cmd_status(sk, hdev->id, MGMT_OP_SET_SSP,
		MGMT_STATUS_BUSY);
		goto failed;

Admin message