diff options
| author | Nirav Shah <nnshah@qti.qualcomm.com> | 2014-10-10 09:57:03 +0530 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2014-10-10 16:07:42 +0530 |
| commit | 764f5521c0f9ade7bb1898353b625bec02440f82 (patch) | |
| tree | 6a17c289b8d7acba58bb1a5491de85db705433d6 | |
| parent | ca9e2166b4bfe18c96efac0803aa5ea185a810ad (diff) | |
qcacld: Do not set any qpower params in FW
Not setting any qpower parameters from host
FW will handle qpower related parameters.
Change-Id: I2865243017a7bb73e4b6443b67bf1f0229cfc490
CRs-FIXED: 737014
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 1b4dfc3130dd..d8f88b76c435 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -15332,7 +15332,8 @@ static inline u_int32_t wma_get_uapsd_mask(tpUapsd_Params uapsd_params) return uapsd_val; } -static int32_t wma_set_force_sleep(tp_wma_handle wma, u_int32_t vdev_id, u_int8_t enable) +static int32_t wma_set_force_sleep(tp_wma_handle wma, u_int32_t vdev_id, + u_int8_t enable, u_int8_t is_qpower_enabled) { int32_t ret; tANI_U32 cfg_data_val = 0; @@ -15403,7 +15404,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, u_int32_t vdev_id, u_int8_ * So Disable QPower explicitly */ ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, - WMI_STA_PS_ENABLE_QPOWER, 0); + WMI_STA_PS_ENABLE_QPOWER, is_qpower_enabled); if (ret) { WMA_LOGE("Disable QPower Failed vdevId %d", vdev_id); return ret; @@ -15489,7 +15490,8 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, u_int32_t vdev_id, u_int8_ return 0; } -static int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, u_int32_t vdev_id, u_int8_t enable) +int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, u_int32_t vdev_id, + u_int8_t enable) { int32_t ret; tANI_U32 cfg_data_val = 0; @@ -15620,10 +15622,8 @@ static void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) goto resp; } - if(is_qpower_enabled) - ret = wma_set_qpower_force_sleep(wma, vdev_id, false); - else - ret = wma_set_force_sleep(wma, vdev_id, false); + ret = wma_set_force_sleep(wma, vdev_id, false, + is_qpower_enabled); if (ret) { WMA_LOGE("Enable Sta Ps Failed vdevId %d", vdev_id); ps_req->status = VOS_STATUS_E_FAILURE; @@ -15653,10 +15653,9 @@ static void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) } WMA_LOGD("Enable Forced Sleep vdevId %d", vdev_id); - if(is_qpower_enabled) - ret = wma_set_qpower_force_sleep(wma, vdev_id, true); - else - ret = wma_set_force_sleep(wma, vdev_id, true); + + ret = wma_set_force_sleep(wma, vdev_id, false, + is_qpower_enabled); if (ret) { WMA_LOGE("Enable Forced Sleep Failed vdevId %d", @@ -15733,10 +15732,9 @@ static void wma_enable_uapsd_mode(tp_wma_handle wma, } WMA_LOGD("Enable Forced Sleep vdevId %d", vdev_id); - if(is_qpower_enabled) - ret = wma_set_qpower_force_sleep(wma, vdev_id, true); - else - ret = wma_set_force_sleep(wma, vdev_id, true); + + ret = wma_set_force_sleep(wma, vdev_id, false, + is_qpower_enabled); if (ret) { WMA_LOGE("Enable Forced Sleep Failed vdevId %d", vdev_id); ps_req->status = VOS_STATUS_E_FAILURE; @@ -15774,10 +15772,8 @@ static void wma_disable_uapsd_mode(tp_wma_handle wma, } /* Re enable Sta Mode Powersave with proper configuration */ - if(is_qpower_enabled) - ret = wma_set_qpower_force_sleep(wma, vdev_id, false); - else - ret = wma_set_force_sleep(wma, vdev_id, false); + ret = wma_set_force_sleep(wma, vdev_id, false, + is_qpower_enabled); if (ret) { WMA_LOGE("Disable Forced Sleep Failed vdevId %d", vdev_id); ps_req->status = VOS_STATUS_E_FAILURE; |