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

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

Bluetooth: Simplify device type check for AMP discover response 



When counting the number for AMP controllers, a positive check is
used. To be consistent, use the same check when actually adding
the data for the AMP contollers.

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

net/bluetooth/a2mp.c

+7 −11
Original line number Diff line number Diff line
@@ -78,24 +78,20 @@ u8 __next_ident(struct amp_mgr *mgr) 
/* hci_dev_list shall be locked */

static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl)

{

	int i = 0;

	struct hci_dev *hdev;

	int i = 1;



	cl[0].id = AMP_ID_BREDR;

	cl[0].type = AMP_TYPE_BREDR;

	cl[0].status = AMP_STATUS_BLUETOOTH_ONLY;



	list_for_each_entry(hdev, &hci_dev_list, list) {

		/* Iterate through AMP controllers */

		if (hdev->dev_type != HCI_AMP)

			continue;



		/* Starting from second entry */

		++i;



		if (hdev->dev_type == HCI_AMP) {

			cl[i].id = hdev->id;

			cl[i].type = hdev->amp_type;

			cl[i].status = hdev->amp_status;

			i++;

		}

	}

}