mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux (Generic): update to linux-5.1.16
5.1.10 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.10 5.1.11 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.11 5.1.12 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.12 5.1.13 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.13 5.1.14 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.14 5.1.15 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.15 5.1.16 changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.1.16
This commit is contained in:
parent
973b437725
commit
8c216956fd
@ -29,8 +29,8 @@ case "$LINUX" in
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="5.1.9"
|
||||
PKG_SHA256="58c9eca99c3dd2fff5b559302996c985c3f3f2aad0b99b2172a61c4df7122a79"
|
||||
PKG_VERSION="5.1.16"
|
||||
PKG_SHA256="8a3e55be3e788700836db6f75875b4d3b824a581d1eacfc2fcd29ed4e727ba3e"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
|
@ -1,48 +0,0 @@
|
||||
From aa843e35a472a2aff26250662d21ff30629d294c Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Wed, 5 Jun 2019 16:35:18 +0100
|
||||
Subject: [PATCH] Revert "Bluetooth: Align minimum encryption key size for LE
|
||||
and BR/EDR connections"
|
||||
|
||||
This reverts commit 07e38998a19d72b916c39a983c19134522ae806b.
|
||||
---
|
||||
include/net/bluetooth/hci_core.h | 3 ---
|
||||
net/bluetooth/hci_conn.c | 8 --------
|
||||
2 files changed, 11 deletions(-)
|
||||
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index 05b1b96..094e61e 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -190,9 +190,6 @@ struct adv_info {
|
||||
|
||||
#define HCI_MAX_SHORT_NAME_LENGTH 10
|
||||
|
||||
-/* Min encryption key size to match with SMP */
|
||||
-#define HCI_MIN_ENC_KEY_SIZE 7
|
||||
-
|
||||
/* Default LE RPA expiry time, 15 minutes */
|
||||
#define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
|
||||
|
||||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
|
||||
index 3cf0764..bd4978c 100644
|
||||
--- a/net/bluetooth/hci_conn.c
|
||||
+++ b/net/bluetooth/hci_conn.c
|
||||
@@ -1276,14 +1276,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
|
||||
!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
return 0;
|
||||
|
||||
- /* The minimum encryption key size needs to be enforced by the
|
||||
- * host stack before establishing any L2CAP connections. The
|
||||
- * specification in theory allows a minimum of 1, but to align
|
||||
- * BR/EDR and LE transports, a minimum of 7 is chosen.
|
||||
- */
|
||||
- if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
|
||||
- return 0;
|
||||
-
|
||||
return 1;
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
Loading…
x
Reference in New Issue
Block a user