moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Bluetooth: Always request for user confirmation for Just Works"

Browse Source 
This reverts commit 92516cd97f.

Thi 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.

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>
This commit is contained in:
Phil Elwell
2021-03-01 09:14:35 +00:00
committed by Dom Cobley
parent 0dc2adb9a4
commit f051e00c4a
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/bluetooth/smp.c
View File

@@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT) hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
smp->method = JUST_WORKS; smp->method = JUST_WORKS;
/* If Just Works, Continue with Zero TK and ask user-space for /* If Just Works, Continue with Zero TK */
* confirmation */
if (smp->method == JUST_WORKS) { if (smp->method == JUST_WORKS) {
ret = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, set_bit(SMP_FLAG_TK_VALID, &smp->flags);
hcon->type,
hcon->dst_type,
passkey, 1);
if (ret)
return ret;
set_bit(SMP_FLAG_WAIT_USER, &smp->flags);
return 0; return 0;
} }