Commit 72ef0c1a authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Remove unneeded val variable when setting SSP 



The variable val in the set_ssp() function of the management interface
is not needed. Just use cp->val directly since its input values have
already been validated.

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

net/bluetooth/mgmt.c

+3 −5
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 
{

	struct mgmt_mode *cp = data;

	struct pending_cmd *cmd;

	u8 val, status;

	u8 status;

	int err;



	BT_DBG("request for %s", hdev->name);
@@ -1309,8 +1309,6 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 


	hci_dev_lock(hdev);



	val = !!cp->val;



	if (!hdev_is_powered(hdev)) {

		bool changed = false;
@@ -1335,7 +1333,7 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 
		goto failed;

	}



	if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) == val) {

	if (!!cp->val == test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {

		err = send_settings_rsp(sk, MGMT_OP_SET_SSP, hdev);

		goto failed;

	}
@@ -1346,7 +1344,7 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 
		goto failed;

	}



	err = hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, sizeof(val), &val);

	err = hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &cp->val);

	if (err < 0) {

		mgmt_pending_remove(cmd);

		goto failed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE