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/l2cap_core.c | |
| parent | eacb44dff98559d4682072c0061e1ecb63687e9c (diff) | |
| download | linux-stable-b7cb93e52839ee44959adabc17c2a17422e6bd4b.tar.gz linux-stable-b7cb93e52839ee44959adabc17c2a17422e6bd4b.tar.bz2 linux-stable-b7cb93e52839ee44959adabc17c2a17422e6bd4b.zip | |
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/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index af30d8240c80..d69861c89bb5 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6992,7 +6992,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon) if (hci_dev_test_flag(hcon->hdev, HCI_LE_ENABLED) && (bredr_sc_enabled(hcon->hdev) || - test_bit(HCI_FORCE_BREDR_SMP, &hcon->hdev->dbg_flags))) + hci_dev_test_flag(hcon->hdev, HCI_FORCE_BREDR_SMP))) conn->local_fixed_chan |= L2CAP_FC_SMP_BREDR; mutex_init(&conn->ident_lock); |