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

Bluetooth: Rename BT_SUSPEND_COMPLETE

Browse Source 
Renamed BT_SUSPEND_COMPLETE to BT_SUSPEND_CONFIGURE_WAKE since it sets
up the event filter and whitelist for wake-up.

Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: Alain Michaud <alainm@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Abhishek Pandit-Subedi
2020-05-12 19:19:25 -07:00
committed by Marcel Holtmann
parent 91779665c1
commit 0d2c9825e4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/hci_core.h
View File

@@ -110,7 +110,7 @@ enum suspend_tasks {
enum suspended_state { enum suspended_state {
BT_RUNNING = 0, BT_RUNNING = 0,
BT_SUSPEND_DISCONNECT, BT_SUSPEND_DISCONNECT,
BT_SUSPEND_COMPLETE, BT_SUSPEND_CONFIGURE_WAKE,
}; };
struct hci_conn_hash { struct hci_conn_hash {

2
net/bluetooth/hci_core.c
View File

@@ -3353,7 +3353,7 @@ static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action,
/* Only configure whitelist if disconnect succeeded */ /* Only configure whitelist if disconnect succeeded */
if (!ret) if (!ret)
ret = hci_change_suspend_state(hdev, ret = hci_change_suspend_state(hdev,
BT_SUSPEND_COMPLETE); BT_SUSPEND_CONFIGURE_WAKE);
} else if (action == PM_POST_SUSPEND) { } else if (action == PM_POST_SUSPEND) {
ret = hci_change_suspend_state(hdev, BT_RUNNING); ret = hci_change_suspend_state(hdev, BT_RUNNING);
} }

2
net/bluetooth/hci_request.c
View File

@@ -1090,7 +1090,7 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next)
disconnect_counter); disconnect_counter);
set_bit(SUSPEND_DISCONNECTING, hdev->suspend_tasks); set_bit(SUSPEND_DISCONNECTING, hdev->suspend_tasks);
} }
} else if (next == BT_SUSPEND_COMPLETE) { } else if (next == BT_SUSPEND_CONFIGURE_WAKE) {
/* Unpause to take care of updating scanning params */ /* Unpause to take care of updating scanning params */
hdev->scanning_paused = false; hdev->scanning_paused = false;
/* Enable event filter for paired devices */ /* Enable event filter for paired devices */