From 8c6d36397de31b4bed81f30aa8e01a0226db3e4c Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 30 Dec 2020 11:55:19 -0600 Subject: Linux v5.10.4 Signed-off-by: Justin M. Forbes --- ...ix-LL-privacy-BLE-device-fails-to-connect.patch | 75 ---------------------- 1 file changed, 75 deletions(-) delete mode 100644 bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch (limited to 'bluetooth-fix-LL-privacy-BLE-device-fails-to-connect.patch') 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 -To: linux-bluetooth@vger.kernel.org -Cc: chethan.tumkur.narayan@intel.com, ravishankar.srivatsa@intel.com, kiran.k@intel.com, Sathish Narasimman -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: -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 -Reviewed-by: Luiz Augusto von Dentz ---- - 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 - - -- cgit