mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
01d8e41c16
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.51 Removed upstreamed: generic/backport-6.6/200-regmap-maple-work-around-false-positive-warning.patch generic/backport-6.6/822-v6.11-0012-nvmem-Fix-return-type-of-devm_nvmem_device_get-in-ke.patch bcm27xx/patches-6.6/950-1018-drivers-mmc-apply-SD-quirks-earlier-during-probe.patch Manually rebased: bcm27xx/patches-6.6/950-0993-drivers-mmc-cqhci-clear-CQHCI_CTL-if-halt-fails.patch ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=e42ea96d6d36a16526cb82b8aa2e5422814c3250 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=3d1baf322a3a69b38b6b2d511cfe0d611d1b5462 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=115a755bb38db5a1175be44e6a9a93a0a8233885 4. Adapted the changes from Hauke Mehrtens' modification in PR#16366 to 5.15.167 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16370 Signed-off-by: Robert Marko <robimarko@gmail.com>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From eaeca896d077e9e42866f7f7caae7b62211a0d0d Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Mon, 1 Mar 2021 09:12:44 +0000
|
|
Subject: [PATCH 0058/1085] Revert "Bluetooth: Always request for user
|
|
confirmation for Just Works (LE SC)"
|
|
|
|
This reverts commit ffee202a78c2980688bc5d2f7d56480e69a5e0c9.
|
|
|
|
The commit "Bluetooth: Always request for user confirmation for Just
|
|
Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS
|
|
GUI. After reverting it, pairing works again. Although this companion
|
|
commit ("... (LE SC)") has not been demonstrated to be problematic,
|
|
it follows the same logic and therefore could affect some use cases.
|
|
|
|
If another solution to the problem is found then this reversion will
|
|
be removed.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/4139
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
net/bluetooth/smp.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
--- a/net/bluetooth/smp.c
|
|
+++ b/net/bluetooth/smp.c
|
|
@@ -2215,7 +2215,7 @@ mackey_and_ltk:
|
|
if (err)
|
|
return SMP_UNSPECIFIED;
|
|
|
|
- if (smp->method == REQ_OOB) {
|
|
+ if (smp->method == JUST_WORKS || smp->method == REQ_OOB) {
|
|
if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) {
|
|
sc_dhkey_check(smp);
|
|
SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);
|
|
@@ -2230,9 +2230,6 @@ mackey_and_ltk:
|
|
confirm_hint = 0;
|
|
|
|
confirm:
|
|
- if (smp->method == JUST_WORKS)
|
|
- confirm_hint = 1;
|
|
-
|
|
err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, hcon->type,
|
|
hcon->dst_type, passkey, confirm_hint);
|
|
if (err)
|