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

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

Bluetooth: Introduce hci_dev_test_and_change_flag helper macro 



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

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

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -507,6 +507,8 @@ extern struct mutex hci_cb_list_lock; 
#define hci_dev_change_flag(hdev, nr) change_bit((nr), &(hdev)->dev_flags)

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



#define hci_dev_test_and_change_flag(hdev, nr) test_and_change_bit((nr), &(hdev)->dev_flags)



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

int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);

int l2cap_disconn_ind(struct hci_conn *hcon);

net/bluetooth/mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -6102,7 +6102,7 @@ static int set_external_config(struct sock *sk, struct hci_dev *hdev, 
	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED) == is_configured(hdev)) {

		mgmt_index_removed(hdev);



		if (test_and_change_bit(HCI_UNCONFIGURED, &hdev->dev_flags)) {

		if (hci_dev_test_and_change_flag(hdev, HCI_UNCONFIGURED)) {

			hci_dev_set_flag(hdev, HCI_CONFIG);

			hci_dev_set_flag(hdev, HCI_AUTO_OFF);