Bluetooth: Add hci_conn flag for new link key generation

For LE Secure Connections we want to trigger cross transport key
generation only if a new link key was actually created during the BR/EDR
connection. This patch adds a new flag to track this information.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 34ecbf0b7e5b..c3d6390e3b7b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3249,6 +3249,8 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
         conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
         if (conn) {
+                clear_bit(HCI_CONN_NEW_LINK_KEY, &conn->flags);
+
                 if ((key->type == HCI_LK_UNAUTH_COMBINATION_P192 ||
                      key->type == HCI_LK_UNAUTH_COMBINATION_P256) &&
                     conn->auth_type != 0xff && (conn->auth_type & 0x01)) {
@@ -3301,6 +3303,7 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
         conn->disc_timeout = HCI_DISCONN_TIMEOUT;
         hci_conn_drop(conn);
 
+        set_bit(HCI_CONN_NEW_LINK_KEY, &conn->flags);
         conn_set_key(conn, ev->key_type, conn->pin_length);
 
         if (!test_bit(HCI_MGMT, &hdev->dev_flags))