diff options
| -rw-r--r-- | bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch | 75 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 80 deletions
diff --git a/bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch b/bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch deleted file mode 100644 index 593af0402..000000000 --- a/bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch +++ /dev/null @@ -1,75 +0,0 @@ -From MAILER-DAEMON Thu Nov 12 18:45:00 2020 -From: Sathish Narasimman <nsathish41@gmail.com> -To: linux-bluetooth@vger.kernel.org -Cc: chethan.tumkur.narayan@intel.com, ravishankar.srivatsa@intel.com, kiran.k@intel.com, Sathish Narasimman <sathish.narasimman@intel.com> -Subject: [PATCH] Bluetooth: Fix: LL PRivacy BLE device fails to connect -Date: Thu, 22 Oct 2020 13:53:04 +0530 -Message-Id: <20201022082304.31757-1-sathish.narasimman@intel.com> -List-ID: <linux-bluetooth.vger.kernel.org> -X-Mailing-List: linux-bluetooth@vger.kernel.org -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -When adding device to white list the device is added to resolving list -also it has to be added only when HCI_ENABLE_LL_PRIVACY flag is set. -HCI_ENABLE_LL_PRIVACY flag has to be tested before adding/deleting devices -to resolving list. use_ll_privacy macro is used only to check if controller -supports LL_Privacy. - -https://bugzilla.kernel.org/show_bug.cgi?id=209745 - -Signed-off-by: Sathish Narasimman <sathish.narasimman@intel.com> -Reviewed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> ---- - net/bluetooth/hci_request.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c -index 6f12bab4d2fa..610ed0817bd7 100644 ---- a/net/bluetooth/hci_request.c -+++ b/net/bluetooth/hci_request.c -@@ -698,7 +698,8 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr, - cp.bdaddr_type); - hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp); - -- if (use_ll_privacy(req->hdev)) { -+ if (use_ll_privacy(req->hdev) && -+ hci_dev_test_flag(req->hdev, HCI_ENABLE_LL_PRIVACY)) { - struct smp_irk *irk; - - irk = hci_find_irk_by_addr(req->hdev, bdaddr, bdaddr_type); -@@ -732,7 +733,8 @@ static int add_to_white_list(struct hci_request *req, - return -1; - - /* White list can not be used with RPAs */ -- if (!allow_rpa && !use_ll_privacy(hdev) && -+ if (!allow_rpa && -+ !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) && - hci_find_irk_by_addr(hdev, ¶ms->addr, params->addr_type)) { - return -1; - } -@@ -750,7 +752,8 @@ static int add_to_white_list(struct hci_request *req, - cp.bdaddr_type); - hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp); - -- if (use_ll_privacy(hdev)) { -+ if (use_ll_privacy(hdev) && -+ hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY)) { - struct smp_irk *irk; - - irk = hci_find_irk_by_addr(hdev, ¶ms->addr, -@@ -812,7 +815,8 @@ static u8 update_white_list(struct hci_request *req) - } - - /* White list can not be used with RPAs */ -- if (!allow_rpa && !use_ll_privacy(hdev) && -+ if (!allow_rpa && -+ !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) && - hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) { - return 0x00; - } --- -2.17.1 - - diff --git a/kernel.spec b/kernel.spec index 9463bdf99..51d46aa93 100644 --- a/kernel.spec +++ b/kernel.spec @@ -94,7 +94,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 3 +%define stable_update 4 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -844,9 +844,6 @@ Patch101: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch # A patch to fix some undocumented things broke a bunch of Allwinner networks due to wrong assumptions Patch102: 0001-update-phy-on-pine64-a64-devices.patch -# rhbz 1897038 -Patch103: bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch - # END OF PATCH DEFINITIONS %endif @@ -2960,6 +2957,9 @@ fi # # %changelog +* Wed Dec 30 11:51:28 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.4-200 +- Linux v5.10.4 + * Mon Dec 28 08:51:38 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.3-200 - Linux v5.10.3 @@ -1,2 +1,2 @@ SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452 -SHA512 (patch-5.10.3.xz) = 7c999ff311944ec30fa46bf31afa0d2a9d743b4ce9b8b17e97cc675c9fff76f3b0f02e75ae971624e0bf5cffadec5324f0496b53be9f431c0ec65b2bdeb34bda +SHA512 (patch-5.10.4.xz) = 893733c9b9290f7a91bfb31ca9baa762a6460665b59efad6ee194b67807ae3990cf44464a32ea4a7e9620b58d7810ff15a30a7d92f0bf1b14cff3b5730fce49c |