diff options
author | Johan Hedberg | 2012-01-16 05:47:28 +0100 |
---|---|---|
committer | Johan Hedberg | 2012-02-13 16:01:28 +0100 |
commit | 58a681ef1455aef9caad1d41073868fb399373f6 (patch) | |
tree | af78e12c2fff312aebaee55029bceefd6311e432 /include/net | |
parent | Bluetooth: Update device_connected and device_found events to latest API (diff) | |
download | kernel-qcow2-linux-58a681ef1455aef9caad1d41073868fb399373f6.tar.gz kernel-qcow2-linux-58a681ef1455aef9caad1d41073868fb399373f6.tar.xz kernel-qcow2-linux-58a681ef1455aef9caad1d41073868fb399373f6.zip |
Bluetooth: Merge boolean members of struct hci_conn into flags
Now that the flags member of struct hci_conn is supposed to accommodate
any boolean type values we can easily merge all boolean members into it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 18af5427fd0c..7a033111c98f 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -286,7 +286,6 @@ struct hci_conn { __u8 attempt; __u8 dev_class[3]; __u8 features[8]; - __u8 ssp_mode; __u16 interval; __u16 pkt_type; __u16 link_policy; @@ -298,12 +297,10 @@ struct hci_conn { __u8 pin_length; __u8 enc_key_size; __u8 io_capability; - __u8 power_save; __u16 disc_timeout; unsigned long flags; __u8 remote_cap; - __u8 remote_oob; __u8 remote_auth; unsigned int sent; @@ -410,6 +407,9 @@ enum { HCI_CONN_SCO_SETUP_PEND, HCI_CONN_LE_SMP_PEND, HCI_CONN_MGMT_CONNECTED, + HCI_CONN_SSP_ENABLED, + HCI_CONN_POWER_SAVE, + HCI_CONN_REMOTE_OOB, }; static inline void hci_conn_hash_init(struct hci_dev *hdev) |