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

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

Bluetooth: Use DECLARE_BITMAP for hdev->dev_flags field 



The hdev->dev_flags field has outgrown itself on 32-bit systems. So
instead of hacking around it, switch to using DECLARE_BITMAP.

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

include/net/bluetooth/hci.h

+1 −6
Original line number Diff line number Diff line
@@ -226,14 +226,9 @@ enum { 
	HCI_FAST_CONNECTABLE,

	HCI_BREDR_ENABLED,

	HCI_LE_SCAN_INTERRUPTED,

	__HCI_NUM_FLAGS,

};



/* A mask for the flags that are supposed to remain when a reset happens

 * or the HCI device is closed.

 */

#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \

			     BIT(HCI_LE_ADV))



/* HCI timeouts */

#define HCI_DISCONN_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_PAIRING_TIMEOUT	msecs_to_jiffies(60000)	/* 60 seconds */

include/net/bluetooth/hci_core.h

+15 −9
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ struct hci_dev { 
	struct rfkill		*rfkill;



	unsigned long		dbg_flags;

	unsigned long		dev_flags;

	DECLARE_BITMAP(dev_flags, __HCI_NUM_FLAGS);



	struct delayed_work	le_scan_disable;

	struct delayed_work	le_scan_restart;
@@ -502,14 +502,20 @@ 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_clear_flag(hdev, nr)  clear_bit((nr), &(hdev)->dev_flags)

#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_set_flag(hdev, nr)    test_and_set_bit((nr), &(hdev)->dev_flags)

#define hci_dev_test_and_clear_flag(hdev, nr)  test_and_clear_bit((nr), &(hdev)->dev_flags)

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

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

#define hci_dev_clear_flag(hdev, nr)           clear_bit((nr), (hdev)->dev_flags)

#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_set_flag(hdev, nr)    test_and_set_bit((nr), (hdev)->dev_flags)

#define hci_dev_test_and_clear_flag(hdev, nr)  test_and_clear_bit((nr), (hdev)->dev_flags)

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



#define hci_dev_clear_volatile_flags(hdev)			\

	do {							\

		hci_dev_clear_flag(hdev, HCI_LE_SCAN);		\

		hci_dev_clear_flag(hdev, HCI_LE_ADV);		\

		hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);	\

	} while (0)



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

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

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1699,7 +1699,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 


	/* Clear flags */

	hdev->flags &= BIT(HCI_RAW);

	hdev->dev_flags &= ~HCI_PERSISTENT_MASK;

	hci_dev_clear_volatile_flags(hdev);



	/* Controller radio is available but is currently powered down */

	hdev->amp_status = AMP_STATUS_POWERED_DOWN;

net/bluetooth/hci_event.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
		return;



	/* Reset all non-persistent flags */

	hdev->dev_flags &= ~HCI_PERSISTENT_MASK;

	hci_dev_clear_volatile_flags(hdev);



	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);