A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacmn: Change burst_duration and min_rest_time value"

Browse source
This commit is contained in:
Linux Build Service Account 2020-08-06 08:36:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3a514c58e6
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hif/src/hif_runtime_pm.c
View file

@ -1636,7 +1636,7 @@ void hif_runtime_lock_deinit(struct hif_opaque_softc *hif_ctx,
struct hif_pm_runtime_lock *data)
{
struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
struct hif_runtime_pm_ctx *rpm_ctx = hif_bus_get_rpm_ctx(scn);
struct hif_runtime_pm_ctx *rpm_ctx;
struct hif_pm_runtime_lock *context = data;
if (!context) {
@ -1651,6 +1651,7 @@ void hif_runtime_lock_deinit(struct hif_opaque_softc *hif_ctx,
* before freeing the context if context is active.
*/
if (scn) {
rpm_ctx = hif_bus_get_rpm_ctx(scn);
spin_lock_bh(&rpm_ctx->runtime_lock);
__hif_pm_runtime_allow_suspend(scn, context);
spin_unlock_bh(&rpm_ctx->runtime_lock);

13
umac/scan/core/src/wlan_scan_manager.c
View file

@ -650,6 +650,10 @@ static void scm_req_update_concurrency_params(struct wlan_objmgr_vdev *vdev,
req->scan_req.min_rest_time = req->scan_req.max_rest_time;
}
if (policy_mgr_current_concurrency_is_mcc(psoc))
req->scan_req.min_rest_time =
scan_obj->scan_def.conc_max_rest_time;
/*
* If scan req for SAP (ACS Sacn) use dwell_time_active_def as dwell
* time for 2g channels instead of dwell_time_active_2g
@ -709,8 +713,13 @@ static void scm_req_update_concurrency_params(struct wlan_objmgr_vdev *vdev,
break;
}
if (ndi_present ||
((go_present || p2p_cli_present) && sta_active)) {
if (go_present && sta_active) {
req->scan_req.burst_duration =
req->scan_req.dwell_time_active;
break;
}
if (ndi_present || (p2p_cli_present && sta_active)) {
req->scan_req.burst_duration = 0;
break;
}