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>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 18af5427fd0c5e887472eae25855ee5c639effbe..7a033111c98fbd29908f6d9be7e6e3d96bcd291b 100644 (file)
--- 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)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index a707d19ee44ed44c53732d2b11e96bf457f7617a..8288e303621a638f167b800d9f366d16627fa160 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -105,7 +105,8 @@ void hci_acl_connect(struct hci_conn *conn)
                }
 
                memcpy(conn->dev_class, ie->data.dev_class, 3);
-               conn->ssp_mode = ie->data.ssp_mode;
+               if (ie->data.ssp_mode > 0)
+                       set_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
        }
 
        cp.pkt_type = cpu_to_le16(conn->pkt_type);
@@ -386,7 +387,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
        conn->remote_auth = 0xff;
        conn->key_type = 0xff;
 
-       conn->power_save = 1;
+       set_bit(HCI_CONN_POWER_SAVE, &conn->flags);
        conn->disc_timeout = HCI_DISCONN_TIMEOUT;
 
        switch (type) {
@@ -586,7 +587,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
 
        if (acl->state == BT_CONNECTED &&
                        (sco->state == BT_OPEN || sco->state == BT_CLOSED)) {
-               acl->power_save = 1;
+               set_bit(HCI_CONN_POWER_SAVE, &acl->flags);
                hci_conn_enter_active_mode(acl, BT_POWER_FORCE_ACTIVE_ON);
 
                if (test_bit(HCI_CONN_MODE_CHANGE_PEND, &acl->flags)) {
@@ -607,7 +608,8 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
 {
        BT_DBG("conn %p", conn);
 
-       if (conn->ssp_mode > 0 && conn->hdev->ssp_mode > 0 &&
+       if (test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) &&
+                                       conn->hdev->ssp_mode > 0 &&
                                        !(conn->link_mode & HCI_LM_ENCRYPT))
                return 0;
 
@@ -671,7 +673,8 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
        /* For non 2.1 devices and low security level we don't need the link
           key. */
        if (sec_level == BT_SECURITY_LOW &&
-                               (!conn->ssp_mode || !conn->hdev->ssp_mode))
+                       (!test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) ||
+                                                       !conn->hdev->ssp_mode))
                return 1;
 
        /* For other security levels we need the link key. */
@@ -778,7 +781,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
        if (conn->mode != HCI_CM_SNIFF)
                goto timer;
 
-       if (!conn->power_save && !force_active)
+       if (!test_bit(HCI_CONN_POWER_SAVE, &conn->flags) && !force_active)
                goto timer;
 
        if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->flags)) {

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f0b08ab734d79d17a1dd300100c262878224ae53..02ad538017329c9c70ad3d19a2093972912aa56e 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1264,7 +1264,8 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
 
        /* Only request authentication for SSP connections or non-SSP
         * devices with sec_level HIGH or if MITM protection is requested */
-       if (!(hdev->ssp_mode > 0 && conn->ssp_mode > 0) &&
+       if (!(hdev->ssp_mode > 0 &&
+                       test_bit(HCI_CONN_SSP_ENABLED, &conn->flags)) &&
                                conn->pending_sec_level != BT_SECURITY_HIGH &&
                                !(conn->auth_type & 0x01))
                return 0;
@@ -1838,7 +1839,8 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
                goto unlock;
 
        if (!ev->status) {
-               if (!(conn->ssp_mode > 0 && hdev->ssp_mode > 0) &&
+               if (!(test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) &&
+                                                       hdev->ssp_mode > 0) &&
                                test_bit(HCI_CONN_REAUTH_PEND,  &conn->flags)) {
                        BT_INFO("re-auth of legacy device is not possible.");
                } else {
@@ -1853,7 +1855,8 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
        clear_bit(HCI_CONN_REAUTH_PEND, &conn->flags);
 
        if (conn->state == BT_CONFIG) {
-               if (!ev->status && hdev->ssp_mode > 0 && conn->ssp_mode > 0) {
+               if (!ev->status && hdev->ssp_mode > 0 &&
+                               test_bit(HCI_CONN_SSP_ENABLED, &conn->flags)) {
                        struct hci_cp_set_conn_encrypt cp;
                        cp.handle  = ev->handle;
                        cp.encrypt = 0x01;
@@ -2505,9 +2508,9 @@ static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb
 
                if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->flags)) {
                        if (conn->mode == HCI_CM_ACTIVE)
-                               conn->power_save = 1;
+                               set_bit(HCI_CONN_POWER_SAVE, &conn->flags);
                        else
-                               conn->power_save = 0;
+                               clear_bit(HCI_CONN_POWER_SAVE, &conn->flags);
                }
 
                if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
@@ -2780,7 +2783,8 @@ static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_b
                if (ie)
                        ie->data.ssp_mode = (ev->features[0] & 0x01);
 
-               conn->ssp_mode = (ev->features[0] & 0x01);
+               if (ev->features[0] & 0x01)
+                       set_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
        }
 
        if (conn->state != BT_CONFIG)
@@ -2962,7 +2966,7 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff
                conn->auth_type = hci_get_auth_req(conn);
                cp.authentication = conn->auth_type;
 
-               if ((conn->out == 0x01 || conn->remote_oob == 0x01) &&
+               if ((conn->out || test_bit(HCI_CONN_REMOTE_OOB, &conn->flags)) &&
                                hci_find_remote_oob_data(hdev, &conn->dst))
                        cp.oob_data = 0x01;
                else
@@ -2998,8 +3002,9 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s
                goto unlock;
 
        conn->remote_cap = ev->capability;
-       conn->remote_oob = ev->oob_data;
        conn->remote_auth = ev->authentication;
+       if (ev->oob_data)
+               set_bit(HCI_CONN_REMOTE_OOB, &conn->flags);
 
 unlock:
        hci_dev_unlock(hdev);