diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index d2218c541b8f..885817a58d00 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -1602,12 +1602,12 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, INIT_COMPLETION(hdd_ctx->ready_to_extwow); - cdf_ret_status = sme_configure_ext_wo_w(hHal, ¶ms, + cdf_ret_status = sme_configure_ext_wow(hHal, ¶ms, &wlan_hdd_ready_to_extwow, hdd_ctx); if (CDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, - FL("sme_configure_ext_wo_w returned failure %d"), + FL("sme_configure_ext_wow returned failure %d"), cdf_ret_status); return -EPERM; } diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index ccc87123e169..1ed186ec59c5 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -113,25 +113,16 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, uint8_t *addr, } /** - * lim_remove_timeout_pb_csessions + * lim_remove_timeout_pbc_sessions() - remove pbc probe req entries. + * @pMac - Pointer to Global MAC structure + * @pbc - The beginning entry in WPS PBC probe request link list * - ***FUNCTION: - * This function is called to remove the WPS PBC probe request entires from specific entry to end. + * This function is called to remove the WPS PBC probe request entries from + * specific entry to end. * - ***LOGIC: - * - * - ***ASSUMPTIONS: - * - * - ***NOTE: - * - * @param pMac Pointer to Global MAC structure - * @param pbc The beginning entry in WPS PBC probe request link list - * - * @return None + * Return - None */ -static void lim_remove_timeout_pb_csessions(tpAniSirGlobal pMac, +static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal pMac, tSirWPSPBCSession *pbc) { tSirWPSPBCSession *prev; @@ -267,7 +258,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, while (pbc) { if (curTime > pbc->timestamp + SIR_WPS_PBC_WALK_TIME) { prev->next = NULL; - lim_remove_timeout_pb_csessions(pMac, pbc); + lim_remove_timeout_pbc_sessions(pMac, pbc); break; } prev = pbc; @@ -298,7 +289,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, void lim_wpspbc_close(tpAniSirGlobal pMac, tpPESession psessionEntry) { - lim_remove_timeout_pb_csessions(pMac, psessionEntry->pAPWPSPBCSession); + lim_remove_timeout_pbc_sessions(pMac, psessionEntry->pAPWPSPBCSession); } diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 15d3d864c9ac..b4af548b7f9d 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -498,7 +498,7 @@ CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, CDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpSirWlanResumeParam wlanResumeParam); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT -CDF_STATUS sme_configure_ext_wo_w(tHalHandle hHal, +CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, tpSirExtWoWParams wlanExtParams, csr_readyToSuspendCallback callback, void *callbackContext); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index a4f8c06ea19f..54ac7f07500e 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1590,23 +1590,19 @@ void sme_process_ready_to_suspend(tHalHandle hHal, } #ifdef WLAN_FEATURE_EXTWOW_SUPPORT -/*-------------------------------------------------------------------------- - \fn - sme_process_ready_to_ext_wo_w - \brief - On getting ready to Ext WoW indication, this function calls - callback registered (HDD callbacks) with SME to inform - ready to ExtWoW indication. - - \param hHal - Handle returned by mac_open. - pReadyToExtWoW - Parameter received along with ready to Ext WoW - indication from WMA. - - \return None - - \sa - - --------------------------------------------------------------------------*/ -void sme_process_ready_to_ext_wo_w(tHalHandle hHal, +/** + * sme_process_ready_to_ext_wow() - inform ready to ExtWoW indication. + * @hHal - Handle returned by mac_open. + * @pReadyToExtWoW - Parameter received along with ready to Ext WoW + * indication from WMA. + * + * On getting ready to Ext WoW indication, this function calls callback + * registered (HDD callback)with SME to inform ready to ExtWoW indication. + * + * Return: None + */ +void sme_process_ready_to_ext_wow(tHalHandle hHal, tpSirReadyToExtWoWInd pReadyToExtWoW) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -2509,7 +2505,7 @@ CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) #ifdef WLAN_FEATURE_EXTWOW_SUPPORT case eWNI_SME_READY_TO_EXTWOW_IND: if (pMsg->bodyptr) { - sme_process_ready_to_ext_wo_w(pMac, pMsg->bodyptr); + sme_process_ready_to_ext_wow(pMac, pMsg->bodyptr); cdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), @@ -6619,23 +6615,17 @@ CDF_STATUS sme_configure_resume_req(tHalHandle hHal, } #ifdef WLAN_FEATURE_EXTWOW_SUPPORT -/* --------------------------------------------------------------------------- - - \fn sme_configure_ext_wo_w - - \brief - SME will pass this request to lower mac to configure Extr WoW - - \param - - hHal - The handle returned by mac_open. - - wlanExtParams- Depicts the wlan Ext params - - \return CDF_STATUS - - --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_ext_wo_w(tHalHandle hHal, +/** + * sme_configure_ext_wow() - configure Extr WoW + * @hHal - The handle returned by mac_open. + * @wlanExtParams - Depicts the wlan Ext params. + * @callback - ext_wow callback to be registered. + * @callback_context - ext_wow callback context + * + * SME will pass this request to lower mac to configure Extr WoW + * Return: CDF_STATUS + */ +CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, tpSirExtWoWParams wlanExtParams, csr_readyToExtWoWCallback callback, void *callback_context)