From 1dee47873f6204f86374852d574afa131657edb1 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 20 Nov 2020 11:16:25 -0800 Subject: Updated to 5.9.9 Signed-off-by: Aqua-sama --- ...ix-LL-PRivacy-BLE-device-fails-to-connect.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch (limited to '0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch') diff --git a/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch b/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch new file mode 100644 index 0000000..f29b2bc --- /dev/null +++ b/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch @@ -0,0 +1,67 @@ +From b2e41088d2a2b3dd99f268833d8079d1a98ee3ea Mon Sep 17 00:00:00 2001 +From: Sathish Narasimman +Date: Thu, 29 Oct 2020 13:18:21 +0530 +Subject: Bluetooth: Fix: LL PRivacy BLE device fails to connect + +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 + +Fixes: 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist") +Signed-off-by: Sathish Narasimman +Signed-off-by: Marcel Holtmann +--- + 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 e0269192f2e5..a565c91b8599 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; + } +-- +cgit v1.2.3-1-gf6bb5 + -- cgit v1.2.1