diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index cb1449954bb3..22c00a923210 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -268,7 +268,6 @@ struct sir_cfg_action_frm_tb_ppdu { #define SIR_HAL_UPDATE_EDCA_PROFILE_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 22) #define SIR_HAL_UPDATE_BEACON_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 23) -#define SIR_HAL_UPDATE_CF_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 24) #define SIR_HAL_CHNL_SWITCH_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 25) #define SIR_HAL_ADD_TS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 26) #define SIR_HAL_DEL_TS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 27) diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index b2573d637204..f1dd58f9505d 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -36,56 +36,6 @@ #endif /* FEATURE_WLAN_DIAG_SUPPORT */ #include "lim_utils.h" -/** - * lim_send_cf_params() - * - ***FUNCTION: - * This function is called to send CFP Parameters to WMA, when they are changed. - * - ***LOGIC: - * - ***ASSUMPTIONS: - * NA - * - ***NOTE: - * NA - * - * @param mac pointer to Global Mac structure. - * @param bssIdx Bss Index of the BSS to which STA is associated. - * @param cfpCount CFP Count, if that is changed. - * @param cfpPeriod CFP Period if that is changed. - * - * @return success if message send is ok, else false. - */ -QDF_STATUS lim_send_cf_params(struct mac_context *mac, uint8_t bssIdx, - uint8_t cfpCount, uint8_t cfpPeriod) -{ - tpUpdateCFParams pCFParams = NULL; - QDF_STATUS retCode = QDF_STATUS_SUCCESS; - struct scheduler_msg msgQ = {0}; - - pCFParams = qdf_mem_malloc(sizeof(tUpdateCFParams)); - if (!pCFParams) - return QDF_STATUS_E_NOMEM; - pCFParams->cfpCount = cfpCount; - pCFParams->cfpPeriod = cfpPeriod; - pCFParams->bssIdx = bssIdx; - - msgQ.type = WMA_UPDATE_CF_IND; - msgQ.reserved = 0; - msgQ.bodyptr = pCFParams; - msgQ.bodyval = 0; - pe_debug("Sending WMA_UPDATE_CF_IND"); - MTRACE(mac_trace_msg_tx(mac, NO_SESSION, msgQ.type)); - retCode = wma_post_ctrl_msg(mac, &msgQ); - if (QDF_STATUS_SUCCESS != retCode) { - qdf_mem_free(pCFParams); - pe_err("Posting WMA_UPDATE_CF_IND failed, reason=%X", - retCode); - } - return retCode; -} - /** * lim_send_beacon_params() - updates bcn params to WMA * diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index de370866a1b4..ea138a638740 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -34,8 +34,6 @@ #include "lim_types.h" #include "wma_if.h" #include "sir_params.h" -QDF_STATUS lim_send_cf_params(struct mac_context *mac, uint8_t bssIdx, - uint8_t cfpCount, uint8_t cfpPeriod); QDF_STATUS lim_send_beacon_params(struct mac_context *mac, tpUpdateBeaconParams pUpdatedBcnParams, struct pe_session *pe_session); diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index a0710d8e296d..de44d88e79df 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -415,10 +415,6 @@ sch_bcn_process_sta(struct mac_context *mac_ctx, return false; } mac_ctx->mlme_cfg->rates.cfp_period = bcn->cfParamSet.cfpPeriod; - - lim_send_cf_params(mac_ctx, *bssIdx, - bcn->cfParamSet.cfpCount, - bcn->cfParamSet.cfpPeriod); } /* No need to send DTIM Period and Count to HAL/SMAC */ diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index be0c5128f529..802a669ace1a 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -418,7 +418,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(WMA_UPDATE_EDCA_PROFILE_IND); CASE_RETURN_STRING(WMA_UPDATE_BEACON_IND); - CASE_RETURN_STRING(WMA_UPDATE_CF_IND); CASE_RETURN_STRING(WMA_CHNL_SWITCH_REQ); CASE_RETURN_STRING(WMA_ADD_TS_REQ); CASE_RETURN_STRING(WMA_DEL_TS_REQ); diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 753ba523f3f1..f0aa795e6d15 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -861,23 +861,6 @@ typedef struct { tSirMacAddr peer_mac; } tUpdateUserPos, *tpUpdateUserPos; -/** - * struct tUpdateCFParams -CF parameters - * @bssIdx: BSSID index - * @cfpCount: CFP count - * @cfpPeriod: the number of DTIM intervals between the start of CFPs - */ -typedef struct { - uint8_t bssIdx; - /* - * cfpCount indicates how many DTIMs (including the current frame) - * appear before the next CFP start. A CFPCount of 0 indicates that - * the current DTIM marks the start of the CFP. - */ - uint8_t cfpCount; - uint8_t cfpPeriod; -} tUpdateCFParams, *tpUpdateCFParams; - /** * struct tSwitchChannelParams - switch channel request parameter * @channelNumber: channel number diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 7e2c9816d291..a1a75520bdfb 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -152,7 +152,6 @@ #define WMA_UPDATE_EDCA_PROFILE_IND SIR_HAL_UPDATE_EDCA_PROFILE_IND #define WMA_UPDATE_BEACON_IND SIR_HAL_UPDATE_BEACON_IND -#define WMA_UPDATE_CF_IND SIR_HAL_UPDATE_CF_IND #define WMA_CHNL_SWITCH_REQ SIR_HAL_CHNL_SWITCH_REQ #define WMA_ADD_TS_REQ SIR_HAL_ADD_TS_REQ #define WMA_DEL_TS_REQ SIR_HAL_DEL_TS_REQ