diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2015-03-13 09:04:17 -0700 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-03-13 18:35:45 +0200 |
commit | eacb44dff98559d4682072c0061e1ecb63687e9c (patch) | |
tree | 5634cae7658ca3029b8d56426086d5fa6f7e7299 /include/net/bluetooth/hci.h | |
parent | 6576fe4afc1203d27a5f4c8f5511f44203f4e333 (diff) | |
download | linux-eacb44dff98559d4682072c0061e1ecb63687e9c.tar.gz linux-eacb44dff98559d4682072c0061e1ecb63687e9c.tar.bz2 linux-eacb44dff98559d4682072c0061e1ecb63687e9c.zip |
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/net/bluetooth/hci.h')
-rw-r--r-- | include/net/bluetooth/hci.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 0f3413b285a5..7a0272a6f0ba 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -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 */ |