From bb6cb4a18cbcc000a9e3721bb4c25d0475f57ab4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 25 Jun 2019 22:46:50 +0200 Subject: [PATCH] linux (RPi): update to 4.19.56 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 +- ...9-revert-faulty-bt-encryption-commit.patch | 48 ------------------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 4a6ea8d6ef..af6fd5a378 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="71d47f4c4bd7fd395b87c474498187b2f9be8751" - PKG_SHA256="d1ef4b20f0e0435ed1792eccee99d430b06404ba114dbe3f17e0af616a9b748d" + PKG_VERSION="7b5c53d89a53e343679759476a27bb7af736ea22" + PKG_SHA256="0b5b1076bc39df3d716449a0f0e4ebee78b974f0aff4f0a3c90b117fcc4dac49" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch b/packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch deleted file mode 100644 index 43bdf5e60f..0000000000 --- a/packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch +++ /dev/null @@ -1,48 +0,0 @@ -From aa843e35a472a2aff26250662d21ff30629d294c Mon Sep 17 00:00:00 2001 -From: MilhouseVH -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 -