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

Bluetooth: Remove mgmt_valid_hdev() helper function 



The helper function mgmt_valid_hdev() is more obfuscating the code
then it makes it easier to read. So intead of this helper, use the
direct check for BR/EDR device type.

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

include/net/bluetooth/hci_core.h

+0 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,6 @@ int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
int mgmt_discovering(struct hci_dev *hdev, u8 discovering);

int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

bool mgmt_valid_hdev(struct hci_dev *hdev);

int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent);

void mgmt_reenable_advertising(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ static int hci_dev_do_open(struct hci_dev *hdev) 
		hci_notify(hdev, HCI_DEV_UP);

		if (!test_bit(HCI_SETUP, &hdev->dev_flags) &&

		    !test_bit(HCI_USER_CHANNEL, &hdev->dev_flags) &&

		    mgmt_valid_hdev(hdev)) {

		    hdev->dev_type == HCI_BREDR) {

			hci_dev_lock(hdev);

			mgmt_powered(hdev, 1);

			hci_dev_unlock(hdev);
@@ -1394,7 +1394,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	hdev->dev_flags &= ~HCI_PERSISTENT_MASK;



	if (!test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags) &&

	    mgmt_valid_hdev(hdev)) {

	    hdev->dev_type == HCI_BREDR) {

		hci_dev_lock(hdev);

		mgmt_powered(hdev, 0);

		hci_dev_unlock(hdev);

net/bluetooth/mgmt.c

+8 −16
Original line number Diff line number Diff line
@@ -182,11 +182,6 @@ static u8 mgmt_status_table[] = { 
	MGMT_STATUS_CONNECT_FAILED,	/* MAC Connection Failed */

};



bool mgmt_valid_hdev(struct hci_dev *hdev)

{

	return hdev->dev_type == HCI_BREDR;

}



static u8 mgmt_status(u8 hci_status)

{

	if (hci_status < ARRAY_SIZE(mgmt_status_table))
@@ -322,9 +317,7 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data, 


	count = 0;

	list_for_each_entry(d, &hci_dev_list, list) {

		if (!mgmt_valid_hdev(d))

			continue;



		if (d->dev_type == HCI_BREDR)

			count++;

	}
@@ -343,12 +336,11 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data, 
		if (test_bit(HCI_USER_CHANNEL, &d->dev_flags))

			continue;



		if (!mgmt_valid_hdev(d))

			continue;



		if (d->dev_type == HCI_BREDR) {

			rp->index[count++] = cpu_to_le16(d->id);

			BT_DBG("Added hci%u", d->id);

		}

	}



	rp->num_controllers = cpu_to_le16(count);

	rp_len = sizeof(*rp) + (2 * count);
@@ -3790,7 +3782,7 @@ done: 


int mgmt_index_added(struct hci_dev *hdev)

{

	if (!mgmt_valid_hdev(hdev))

	if (hdev->dev_type != HCI_BREDR)

		return -ENOTSUPP;



	return mgmt_event(MGMT_EV_INDEX_ADDED, hdev, NULL, 0, NULL);
@@ -3800,7 +3792,7 @@ int mgmt_index_removed(struct hci_dev *hdev) 
{

	u8 status = MGMT_STATUS_INVALID_INDEX;



	if (!mgmt_valid_hdev(hdev))

	if (hdev->dev_type != HCI_BREDR)

		return -ENOTSUPP;



	mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status);

CRA Git | Maintained and supported by SUSTech CRA and CCSE