Bluetooth: Convert hcon->flush_key to a proper flag

There's no point in having boolean variables in the hci_conn struct
since it already has a flags member. This patch converts the flush_key
member into a proper flag.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

2 files changed, 7 insertions, 3 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 888911d205dc..4f70605e0399 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -394,7 +394,6 @@ struct hci_conn {
         __u8            remote_cap;
         __u8            remote_auth;
         __u8            remote_id;
-        bool            flush_key;
 
         unsigned int    sent;
 
@@ -524,6 +523,7 @@ enum {
         HCI_CONN_AES_CCM,
         HCI_CONN_POWER_SAVE,
         HCI_CONN_REMOTE_OOB,
+        HCI_CONN_FLUSH_KEY,
 };
 
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c92c5a020fe7..90cba6a8293b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2159,7 +2159,8 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
         mgmt_device_disconnected(hdev, &conn->dst, conn->type, conn->dst_type,
                                 reason, mgmt_connected);
 
-        if (conn->type == ACL_LINK && conn->flush_key)
+        if (conn->type == ACL_LINK &&
+            test_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
                 hci_remove_link_key(hdev, &conn->dst);
 
         params = hci_conn_params_lookup(hdev, &conn->dst, conn->dst_type);
@@ -3145,7 +3146,10 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
                 list_del(&key->list);
                 kfree(key);
         } else if (conn) {
-                conn->flush_key = !persistent;
+                if (persistent)
+                        clear_bit(HCI_CONN_FLUSH_KEY, &conn->flags);
+                else
+                        set_bit(HCI_CONN_FLUSH_KEY, &conn->flags);
         }
 
 unlock: