qcacld-3.0: Remove Radio measurement related cfg entries

qcacld-2.0 to qcacld-3.0 propagation

Remove cfg entries related to radio measurement(RM).

We have support to enable/disable RM capability through INI config.
We also had entry in cfg static table(cfg.dat). This change set
will remove entries related to RM.

Change-Id: Ic56cc34628cd1c0fb10512069ef6dc5f0eebb887
CRs-Fixed: 924420

core/mac/inc/wni_cfg.h

@@ -273,9 +273,6 @@ enum {
 	WNI_CFG_RPE_AGING_THRESHOLD_FOR_AC3_REG,
 	WNI_CFG_NO_OF_ONCHIP_REORDER_SESSIONS,
 	WNI_CFG_SINGLE_TID_RC,
-	WNI_CFG_RRM_ENABLED,
-	WNI_CFG_RRM_OPERATING_CHAN_MAX,
-	WNI_CFG_RRM_NON_OPERATING_CHAN_MAX,
 	WNI_CFG_TX_PWR_CTRL_ENABLE,
 	WNI_CFG_MCAST_BCAST_FILTER_SETTING,
 	WNI_CFG_BTC_DHCP_BT_SLOTS_TO_BLOCK,
@@ -1367,18 +1364,6 @@ enum {
 #define WNI_CFG_SINGLE_TID_RC_STAMAX    1
 #define WNI_CFG_SINGLE_TID_RC_STADEF    1
 
-#define WNI_CFG_RRM_ENABLED_STAMIN    0
-#define WNI_CFG_RRM_ENABLED_STAMAX    1
-#define WNI_CFG_RRM_ENABLED_STADEF    0
-
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX_STAMIN    0
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX_STAMAX    8
-#define WNI_CFG_RRM_OPERATING_CHAN_MAX_STADEF    0
-
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX_STAMIN    0
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX_STAMAX    8
-#define WNI_CFG_RRM_NON_OPERATING_CHAN_MAX_STADEF    0
-
 #define WNI_CFG_TX_PWR_CTRL_ENABLE_STAMIN    0
 #define WNI_CFG_TX_PWR_CTRL_ENABLE_STAMAX    1
 #define WNI_CFG_TX_PWR_CTRL_ENABLE_STADEF    1
@@ -1563,8 +1548,8 @@ enum {
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STAMAX    1
 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STADEF    0
 
-#define CFG_PARAM_MAX_NUM        289
-#define CFG_STA_IBUF_MAX_SIZE    237
+#define CFG_PARAM_MAX_NUM        286
+#define CFG_STA_IBUF_MAX_SIZE    234
 #define CFG_STA_SBUF_MAX_SIZE    3199
 
 #define CFG_STA_MAGIC_DWORD    0xbeefbeef

core/mac/src/cfg/cfg_api.c

@@ -770,19 +770,10 @@ tSirRetStatus cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
 		pCapInfo->apsd = 1;
 
 #if defined WLAN_FEATURE_VOWIFI
-	if (LIM_IS_STA_ROLE(sessionEntry)) {
-		if (wlan_cfg_get_int(pMac, WNI_CFG_RRM_ENABLED, &val) !=
-		    eSIR_SUCCESS) {
-			cfg_log(pMac, LOGP,
-				FL("cfg get WNI_CFG_RRM_ENABLED failed"));
-			return eSIR_FAILURE;
-		}
+	pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
 #if defined WLAN_VOWIFI_DEBUG
-		PELOGE(cfg_log(pMac, LOGE, "RRM = %d", val);)
+	cfg_log(pMac, LOGE, FL("RRM = %d"), pCapInfo->rrm);
 #endif
-		if (val)
-			pCapInfo->rrm = 1;
-	}
 #endif
 	/* DSSS-OFDM */
 	/* FIXME : no config defined yet. */

core/mac/src/cfg/cfg_param_name.c

@@ -274,9 +274,6 @@ unsigned char *g_cfg_param_name[] = {
 	(unsigned char *)"RPE_AGING_THRESHOLD_FOR_AC3_REG",
 	(unsigned char *)"NO_OF_ONCHIP_REORDER_SESSIONS",
 	(unsigned char *)"SINGLE_TID_RC",
-	(unsigned char *)"RRM_ENABLED",
-	(unsigned char *)"RRM_OPERATING_CHAN_MAX",
-	(unsigned char *)"RRM_NON_OPERATING_CHAN_MAX",
 	(unsigned char *)"TX_PWR_CTRL_ENABLE",
 	(unsigned char *)"MCAST_BCAST_FILTER_SETTING",
 	(unsigned char *)"BTC_DHCP_BT_SLOTS_TO_BLOCK",

core/mac/src/cfg/cfg_proc_msg.c

@@ -1266,21 +1266,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_SINGLE_TID_RC_STAMIN,
 	WNI_CFG_SINGLE_TID_RC_STAMAX,
 	WNI_CFG_SINGLE_TID_RC_STADEF},
-	{WNI_CFG_RRM_ENABLED,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RRM_ENABLED_STAMIN,
-	WNI_CFG_RRM_ENABLED_STAMAX,
-	WNI_CFG_RRM_ENABLED_STADEF},
-	{WNI_CFG_RRM_OPERATING_CHAN_MAX,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RRM_OPERATING_CHAN_MAX_STAMIN,
-	WNI_CFG_RRM_OPERATING_CHAN_MAX_STAMAX,
-	WNI_CFG_RRM_OPERATING_CHAN_MAX_STADEF},
-	{WNI_CFG_RRM_NON_OPERATING_CHAN_MAX,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_RRM_NON_OPERATING_CHAN_MAX_STAMIN,
-	WNI_CFG_RRM_NON_OPERATING_CHAN_MAX_STAMAX,
-	WNI_CFG_RRM_NON_OPERATING_CHAN_MAX_STADEF},
 	{WNI_CFG_TX_PWR_CTRL_ENABLE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_TX_PWR_CTRL_ENABLE_STAMIN,

core/wma/src/wma_scan_roam.c

@@ -2949,13 +2949,9 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	}
 	if (val)
 		selfCaps.apsd = 1;
-	if (wlan_cfg_get_int(pMac, WNI_CFG_RRM_ENABLED, &val) != eSIR_SUCCESS) {
-		CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
-			  "Failed to get WNI_CFG_RRM_ENABLED");
-		return CDF_STATUS_E_FAILURE;
-	}
-	if (val)
-		selfCaps.rrm = 1;
+
+	selfCaps.rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
+
 	if (wlan_cfg_get_int(pMac, WNI_CFG_BLOCK_ACK_ENABLED, &val) !=
 	    eSIR_SUCCESS) {
 		CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,