diff options
| author | Johan Hedberg | 2012-01-16 05:10:31 +0100 |
|---|---|---|
| committer | Johan Hedberg | 2012-02-13 16:01:28 +0100 |
| commit | 51a8efd7d02c13cb1c6fdd1cd66788792a3fcc7c (patch) | |
| tree | 819b6bfcb3b898be27d67a942d75aafbc10f24c5 /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Merge device class into the EIR data in mgmt_ev_device_found (diff) | |
| download | kernel-qcow2-linux-51a8efd7d02c13cb1c6fdd1cd66788792a3fcc7c.tar.gz kernel-qcow2-linux-51a8efd7d02c13cb1c6fdd1cd66788792a3fcc7c.tar.xz kernel-qcow2-linux-51a8efd7d02c13cb1c6fdd1cd66788792a3fcc7c.zip | |
Bluetooth: Rename conn->pend to conn->flags
These flags can and will be used for more general purpose values than
just pending state transitions so the more common name "flags" makes
more sense than "pend".
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
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 a66e5ec9adef..27b72d954436 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1020,7 +1020,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT) __cancel_delayed_work(&conn->info_timer); - if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->pend)) { + if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) { __cancel_delayed_work(&conn->security_timer); smp_chan_destroy(conn); } |