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

Bluetooth: Introduce hci_dev_set_flag helper macro 



Instead of manually coding set_bit on hdev->dev_flags all the time,
use hci_dev_set_flag helper macro.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ extern struct list_head hci_cb_list; 
extern rwlock_t hci_dev_list_lock;

extern struct mutex hci_cb_list_lock;



#define hci_dev_set_flag(hdev, nr)    set_bit((nr), &(hdev)->dev_flags)

#define hci_dev_test_flag(hdev, nr)   test_bit((nr), &(hdev)->dev_flags)



/* ----- HCI interface to upper protocols ----- */

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
	 */

	if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {

		hci_req_add_le_scan_disable(&req);

		set_bit(HCI_LE_SCAN_INTERRUPTED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_LE_SCAN_INTERRUPTED);

	}



	hci_req_add_le_create_conn(&req, conn);

net/bluetooth/hci_core.c

+12 −12
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static void le_setup(struct hci_request *req) 


	/* LE-only controllers have LE implicitly enabled */

	if (!lmp_bredr_capable(hdev))

		set_bit(HCI_LE_ENABLED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_LE_ENABLED);

}



static void hci_setup_event_mask(struct hci_request *req)
@@ -1448,7 +1448,7 @@ static int hci_dev_do_open(struct hci_dev *hdev) 
		 */

		if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) ||

		    test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))

			set_bit(HCI_UNCONFIGURED, &hdev->dev_flags);

			hci_dev_set_flag(hdev, HCI_UNCONFIGURED);



		/* For an unconfigured controller it is required to

		 * read at least the version information provided by
@@ -1485,7 +1485,7 @@ static int hci_dev_do_open(struct hci_dev *hdev) 


	if (!ret) {

		hci_dev_hold(hdev);

		set_bit(HCI_RPA_EXPIRED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);

		set_bit(HCI_UP, &hdev->flags);

		hci_notify(hdev, HCI_DEV_UP);

		if (!hci_dev_test_flag(hdev, HCI_SETUP) &&
@@ -1571,7 +1571,7 @@ int hci_dev_open(__u16 dev) 
	 */

	if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&

	    !hci_dev_test_flag(hdev, HCI_MGMT))

		set_bit(HCI_BONDABLE, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_BONDABLE);



	err = hci_dev_do_open(hdev);
@@ -1856,7 +1856,7 @@ static void hci_update_scan_state(struct hci_dev *hdev, u8 scan) 


	if (conn_changed || discov_changed) {

		/* In case this was disabled through mgmt */

		set_bit(HCI_BREDR_ENABLED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_BREDR_ENABLED);



		if (hci_dev_test_flag(hdev, HCI_LE_ENABLED))

			mgmt_update_adv_data(hdev);
@@ -2082,7 +2082,7 @@ static int hci_rfkill_set_block(void *data, bool blocked) 
		return -EBUSY;



	if (blocked) {

		set_bit(HCI_RFKILLED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_RFKILLED);

		if (!hci_dev_test_flag(hdev, HCI_SETUP) &&

		    !hci_dev_test_flag(hdev, HCI_CONFIG))

			hci_dev_do_close(hdev);
@@ -3189,16 +3189,16 @@ int hci_register_dev(struct hci_dev *hdev) 
	}



	if (hdev->rfkill && rfkill_blocked(hdev->rfkill))

		set_bit(HCI_RFKILLED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_RFKILLED);



	set_bit(HCI_SETUP, &hdev->dev_flags);

	set_bit(HCI_AUTO_OFF, &hdev->dev_flags);

	hci_dev_set_flag(hdev, HCI_SETUP);

	hci_dev_set_flag(hdev, HCI_AUTO_OFF);



	if (hdev->dev_type == HCI_BREDR) {

		/* Assume BR/EDR support until proven otherwise (such as

		 * through reading supported features during init.

		 */

		set_bit(HCI_BREDR_ENABLED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_BREDR_ENABLED);

	}



	write_lock(&hci_dev_list_lock);
@@ -3209,7 +3209,7 @@ int hci_register_dev(struct hci_dev *hdev) 
	 * and should not be included in normal operation.

	 */

	if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))

		set_bit(HCI_UNCONFIGURED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_UNCONFIGURED);



	hci_notify(hdev, HCI_DEV_REG);

	hci_dev_hold(hdev);
@@ -3235,7 +3235,7 @@ void hci_unregister_dev(struct hci_dev *hdev) 


	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);



	set_bit(HCI_UNREGISTER, &hdev->dev_flags);

	hci_dev_set_flag(hdev, HCI_UNREGISTER);



	id = hdev->id;

net/bluetooth/hci_event.c

+7 −7
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void hci_cc_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) 
	if (status)

		return;



	set_bit(HCI_PERIODIC_INQ, &hdev->dev_flags);

	hci_dev_set_flag(hdev, HCI_PERIODIC_INQ);

}



static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
@@ -501,7 +501,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb) 
		mgmt_ssp_enable_complete(hdev, sent->mode, status);

	else if (!status) {

		if (sent->mode)

			set_bit(HCI_SSP_ENABLED, &hdev->dev_flags);

			hci_dev_set_flag(hdev, HCI_SSP_ENABLED);

		else

			clear_bit(HCI_SSP_ENABLED, &hdev->dev_flags);

	}
@@ -531,7 +531,7 @@ static void hci_cc_write_sc_support(struct hci_dev *hdev, struct sk_buff *skb) 


	if (!hci_dev_test_flag(hdev, HCI_MGMT) && !status) {

		if (sent->support)

			set_bit(HCI_SC_ENABLED, &hdev->dev_flags);

			hci_dev_set_flag(hdev, HCI_SC_ENABLED);

		else

			clear_bit(HCI_SC_ENABLED, &hdev->dev_flags);

	}
@@ -1109,7 +1109,7 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 
	if (*sent) {

		struct hci_conn *conn;



		set_bit(HCI_LE_ADV, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_LE_ADV);



		conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);

		if (conn)
@@ -1192,7 +1192,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 


	switch (cp->enable) {

	case LE_SCAN_ENABLE:

		set_bit(HCI_LE_SCAN, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_LE_SCAN);

		if (hdev->le_scan_type == LE_SCAN_ACTIVE)

			clear_pending_adv_report(hdev);

		break;
@@ -1388,7 +1388,7 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev, 


	if (sent->le) {

		hdev->features[1][0] |= LMP_HOST_LE;

		set_bit(HCI_LE_ENABLED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_LE_ENABLED);

	} else {

		hdev->features[1][0] &= ~LMP_HOST_LE;

		clear_bit(HCI_LE_ENABLED, &hdev->dev_flags);
@@ -2608,7 +2608,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	 * whenever the encryption procedure fails.

	 */

	if (ev->status && conn->type == LE_LINK)

		set_bit(HCI_RPA_EXPIRED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);



	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);

net/bluetooth/hci_request.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static void set_random_addr(struct hci_request *req, bdaddr_t *rpa) 
	if (hci_dev_test_flag(hdev, HCI_LE_ADV) ||

	    hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT)) {

		BT_DBG("Deferring random address update");

		set_bit(HCI_RPA_EXPIRED, &hdev->dev_flags);

		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);

		return;

	}