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

Commit 02c04afe authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Simplify read_adv_features code 



The code in the Read Advertising Features mgmt command handler is
unnecessarily complicated. Clean it up and remove unnecessary
variables & branches.

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

net/bluetooth/mgmt.c

+8 −20
Original line number Diff line number Diff line
@@ -5788,10 +5788,10 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev, 
{

	struct mgmt_rp_read_adv_features *rp;

	size_t rp_len;

	int err, i;

	bool instance;

	int err;

	struct adv_info *adv_instance;

	u32 supported_flags;

	u8 *instance;



	BT_DBG("%s", hdev->name);
@@ -5801,12 +5801,7 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev, 


	hci_dev_lock(hdev);



	rp_len = sizeof(*rp);



	instance = hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE);

	if (instance)

		rp_len += hdev->adv_instance_cnt;



	rp_len = sizeof(*rp) + hdev->adv_instance_cnt;

	rp = kmalloc(rp_len, GFP_ATOMIC);

	if (!rp) {

		hci_dev_unlock(hdev);
@@ -5819,19 +5814,12 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev, 
	rp->max_adv_data_len = HCI_MAX_AD_LENGTH;

	rp->max_scan_rsp_len = HCI_MAX_AD_LENGTH;

	rp->max_instances = HCI_MAX_ADV_INSTANCES;

	rp->num_instances = hdev->adv_instance_cnt;



	if (instance) {

		i = 0;

	instance = rp->instance;

	list_for_each_entry(adv_instance, &hdev->adv_instances, list) {

			if (i >= hdev->adv_instance_cnt)

				break;



			rp->instance[i] = adv_instance->instance;

			i++;

		}

		rp->num_instances = hdev->adv_instance_cnt;

	} else {

		rp->num_instances = 0;

		*instance = adv_instance->instance;

		instance++;

	}



	hci_dev_unlock(hdev);