mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-04-02 10:41:46 -04:00
df536d5e8a
* Add patch to glibc that should have been there a long time ago. * Initial wireguard support * Bluetooth stack fixes, removes need to disable ertm for xbox controllers. * Switch to xpadneo over xpad
104 lines
3 KiB
Diff
104 lines
3 KiB
Diff
From 6373e372ccde29f0657d6a8b10ea58ac092ce89e Mon Sep 17 00:00:00 2001
|
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
Date: Tue, 19 May 2020 13:25:19 -0700
|
|
Subject: [PATCH] Bluetooth: Consolidate encryption handling in hci_encrypt_cfm
|
|
|
|
This makes hci_encrypt_cfm calls hci_connect_cfm in case the connection
|
|
state is BT_CONFIG so callers don't have to check the state.
|
|
|
|
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|
---
|
|
include/net/bluetooth/hci_core.h | 20 ++++++++++++++++++--
|
|
net/bluetooth/hci_event.c | 28 +++-------------------------
|
|
2 files changed, 21 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
|
index 4931787193c3..24bb6f447afc 100644
|
|
--- a/include/net/bluetooth/hci_core.h
|
|
+++ b/include/net/bluetooth/hci_core.h
|
|
@@ -1247,10 +1247,26 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
|
|
conn->security_cfm_cb(conn, status);
|
|
}
|
|
|
|
-static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
|
|
- __u8 encrypt)
|
|
+static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status)
|
|
{
|
|
struct hci_cb *cb;
|
|
+ __u8 encrypt;
|
|
+
|
|
+ if (conn->state == BT_CONFIG) {
|
|
+ if (status)
|
|
+ conn->state = BT_CONNECTED;
|
|
+
|
|
+ hci_connect_cfm(conn, status);
|
|
+ hci_conn_drop(conn);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
|
+ encrypt = 0x00;
|
|
+ else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
|
|
+ encrypt = 0x02;
|
|
+ else
|
|
+ encrypt = 0x01;
|
|
|
|
if (conn->sec_level == BT_SECURITY_SDP)
|
|
conn->sec_level = BT_SECURITY_LOW;
|
|
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
|
|
index d2f9eb169ba8..057dee1d4bd3 100644
|
|
--- a/net/bluetooth/hci_event.c
|
|
+++ b/net/bluetooth/hci_event.c
|
|
@@ -2475,7 +2475,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
|
&cp);
|
|
} else {
|
|
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
|
|
- hci_encrypt_cfm(conn, ev->status, 0x00);
|
|
+ hci_encrypt_cfm(conn, ev->status);
|
|
}
|
|
}
|
|
|
|
@@ -2561,22 +2561,7 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status,
|
|
conn->enc_key_size = rp->key_size;
|
|
}
|
|
|
|
- if (conn->state == BT_CONFIG) {
|
|
- conn->state = BT_CONNECTED;
|
|
- hci_connect_cfm(conn, 0);
|
|
- hci_conn_drop(conn);
|
|
- } else {
|
|
- u8 encrypt;
|
|
-
|
|
- if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
|
- encrypt = 0x00;
|
|
- else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
|
|
- encrypt = 0x02;
|
|
- else
|
|
- encrypt = 0x01;
|
|
-
|
|
- hci_encrypt_cfm(conn, 0, encrypt);
|
|
- }
|
|
+ hci_encrypt_cfm(conn, 0);
|
|
|
|
unlock:
|
|
hci_dev_unlock(hdev);
|
|
@@ -2673,14 +2658,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
|
}
|
|
|
|
notify:
|
|
- if (conn->state == BT_CONFIG) {
|
|
- if (!ev->status)
|
|
- conn->state = BT_CONNECTED;
|
|
-
|
|
- hci_connect_cfm(conn, ev->status);
|
|
- hci_conn_drop(conn);
|
|
- } else
|
|
- hci_encrypt_cfm(conn, ev->status, ev->encrypt);
|
|
+ hci_encrypt_cfm(conn, ev->status);
|
|
|
|
unlock:
|
|
hci_dev_unlock(hdev);
|
|
--
|
|
GitLab
|
|
|