diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-24 21:09:09 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-24 21:09:09 +0200 |
| commit | 828558c64800d913589a096c1abde7707e7e686c (patch) | |
| tree | 30e36f4d5bec2e216e9e18bc0b207fcb9c1b2d09 | |
| parent | fa0f196801ab7ebf7a5982d248300d977ffea0d5 (diff) | |
| parent | 53459f7b69d114a9315ad737219cff653df3e475 (diff) | |
| download | kernel-828558c64800d913589a096c1abde7707e7e686c.tar.gz kernel-828558c64800d913589a096c1abde7707e7e686c.tar.xz kernel-828558c64800d913589a096c1abde7707e7e686c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | Revert-Bluetooth-Align-minimum-encryption-key-size.patch | 54 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 9 |
3 files changed, 7 insertions, 58 deletions
diff --git a/Revert-Bluetooth-Align-minimum-encryption-key-size.patch b/Revert-Bluetooth-Align-minimum-encryption-key-size.patch deleted file mode 100644 index 1318de32a..000000000 --- a/Revert-Bluetooth-Align-minimum-encryption-key-size.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c8f57936ab21a1430ae2209fa874e842d13552d3 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline <jcline@redhat.com> -Date: Tue, 11 Jun 2019 14:59:23 +0000 -Subject: [PATCH] Revert "Bluetooth: Align minimum encryption key size for LE - and BR/EDR connections" - -This reverts commit d5bb334a8e171b262e48f378bd2096c0ea458265. - -This patch broke a number of older bluetooth devices and while an RFC -that fixes this patch has been posted upstream, it has not been merged -and there are still a few folks reporting problems. - -Signed-off-by: Jeremy Cline <jcline@redhat.com> ---- - 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 05b1b96f4d9e..094e61e07030 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 3cf0764d5793..bd4978ce8c45 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.21.0 - @@ -1 +1 @@ -4ae004a9bca8bef118c2b4e76ee31c7df4514f18 +4b972a01a7da614b4796475f933094751a295a2f diff --git a/kernel.spec b/kernel.spec index 5e08c04a5..4cbfaba84 100644 --- a/kernel.spec +++ b/kernel.spec @@ -607,9 +607,6 @@ Patch530: crypto-ghash-fix-unaligned-memory-access-in-ghash_setkey.patch # Fix for new Logitech wireless keyboard support in 5.2, submitted upstream Patch534: 0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch -# Fix for broken bluetooth, reverted in upstream stable, not yet in Torvald's tree -Patch535: Revert-Bluetooth-Align-minimum-encryption-key-size.patch - # END OF PATCH DEFINITIONS %endif @@ -1851,6 +1848,12 @@ fi # # %changelog +* Mon Jun 24 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc6.git0.1 +- Linux v5.2-rc6 + +* Mon Jun 24 2019 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable debugging options. + * Sat Jun 22 2019 Peter Robinson <pbrobinson@fedoraproject.org> - QCom ACPI fixes |