diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2015-03-13 10:20:35 -0700 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-03-13 19:28:36 +0200 |
commit | b7cb93e52839ee44959adabc17c2a17422e6bd4b (patch) | |
tree | 8e00a2b40ace2987f34295f3084edd7fc126181c /net/bluetooth/mgmt.c | |
parent | eacb44dff98559d4682072c0061e1ecb63687e9c (diff) | |
download | op-kernel-dev-b7cb93e52839ee44959adabc17c2a17422e6bd4b.zip op-kernel-dev-b7cb93e52839ee44959adabc17c2a17422e6bd4b.tar.gz |
Bluetooth: Merge hdev->dbg_flags fields into hdev->dev_flags
With the extension of hdev->dev_flags utilizing a bitmap now, the space
is no longer restricted. Merge the hdev->dbg_flags into hdev->dev_flags
to save space on 64-bit architectures. On 32-bit architectures no size
reduction happens.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d97719d..c589086 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -659,7 +659,7 @@ static u32 get_current_settings(struct hci_dev *hdev) * with BR/EDR disabled, the existence of the static address will * be evaluated. */ - if (test_bit(HCI_FORCE_STATIC_ADDR, &hdev->dbg_flags) || + if (hci_dev_test_flag(hdev, HCI_FORCE_STATIC_ADDR) || !hci_dev_test_flag(hdev, HCI_BREDR_ENABLED) || !bacmp(&hdev->bdaddr, BDADDR_ANY)) { if (bacmp(&hdev->static_addr, BDADDR_ANY)) |