qcacld-3.0: Remove dead code tUpdateCFParams and WMA_UPDATE_CF_IND

WMA_UPDATE_CF_IND message (aka SIR_HAL_UPDATE_CF_IND) is dead code, because
it is not processed anywhere.
Remove dead code WMA_UPDATE_CF_IND. The only use of tUpdateCFParams is in
lim_send_cf_params() which only creates a WMA_UPDATE_CF_IND message, so
remove tUpdateCFParams and lim_send_cf_params().

Change-Id: I1b613300cdd7eeeb33825e319977ff941cae548c
CRs-Fixed: 2367931

7 files changed, 2 insertions, 82 deletions

diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index 6c6a3f8c5677..228a67d0faa7 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -258,7 +258,6 @@ struct sir_mgmt_msg {
 #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 621e55a23590..52a2766569c2 100644
--- a/core/mac/src/pe/lim/lim_send_messages.c
+++ b/core/mac/src/pe/lim/lim_send_messages.c
@@ -62,60 +62,6 @@ static tBeaconFilterIe beacon_filter_table[] = {
 };
 
 /**
- * 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 pMac  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.
- */
-tSirRetStatus lim_send_cf_params(tpAniSirGlobal pMac, uint8_t bssIdx,
-				 uint8_t cfpCount, uint8_t cfpPeriod)
-{
-	tpUpdateCFParams pCFParams = NULL;
-	tSirRetStatus retCode = eSIR_SUCCESS;
-	tSirMsgQ msgQ;
-
-	pCFParams = qdf_mem_malloc(sizeof(tUpdateCFParams));
-	if (NULL == pCFParams) {
-		pe_err("Unable to allocate memory during Update CF Params");
-		retCode = eSIR_MEM_ALLOC_FAILED;
-		goto returnFailure;
-	}
-	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(pMac, NO_SESSION, msgQ.type));
-	retCode = wma_post_ctrl_msg(pMac, &msgQ);
-	if (eSIR_SUCCESS != retCode) {
-		qdf_mem_free(pCFParams);
-		pe_err("Posting WMA_UPDATE_CF_IND failed, reason=%X",
-			retCode);
-	}
-returnFailure:
-	return retCode;
-}
-
-/**
  * lim_send_beacon_params() - updates bcn params to WMA
  *
  * @pMac                 : pointer to Global Mac structure.
diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h
index 883ff216da64..fd1e661d55d8 100644
--- a/core/mac/src/pe/lim/lim_send_messages.h
+++ b/core/mac/src/pe/lim/lim_send_messages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -34,8 +34,6 @@
 #include "lim_types.h"
 #include "wma_if.h"
 #include "sir_params.h"
-tSirRetStatus lim_send_cf_params(tpAniSirGlobal pMac, uint8_t bssIdx,
-				 uint8_t cfpCount, uint8_t cfpPeriod);
 tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac,
 				     tpUpdateBeaconParams pUpdatedBcnParams,
 				     tpPESession psessionEntry);
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index e0ccf28dbbc2..ba12a507375a 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -408,13 +408,9 @@ sch_bcn_process_sta(tpAniSirGlobal mac_ctx,
 		beaconParams->beaconInterval = (uint16_t) bi;
 	}
 
-	if (bcn->cfPresent) {
+	if (bcn->cfPresent)
 		cfg_set_int(mac_ctx, WNI_CFG_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 */
 	/* SMAC already parses TIM bit. */
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 c2ec4b77982a..e32b7d5dbaaf 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
@@ -455,7 +455,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 156f84636c90..11c681cd9b50 100644
--- a/core/wma/inc/wma_if.h
+++ b/core/wma/inc/wma_if.h
@@ -852,23 +852,6 @@ typedef struct {
 } 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
  * @localPowerConstraint: local power constraint
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index 508f9a590407..30c1a12446b5 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -160,7 +160,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