qcacld-3.0: Cleanup He cap INI items

Cleanup the below INI items from HDD.
1.CFG_ENABLE_UL_MIMO_NAME
2.CFG_HE_DYNAMIC_FRAGMENTATION_NAME
3.CFG_ENABLE_UL_OFDMA_NAME
4.CFG_HE_STA_OBSSPD_NAME.

Change-Id: I6321035c14cfd03c1c57fd68b5394c84ed9e1f2c
CRs-Fixed: 2375905

core/hdd/inc/wlan_hdd_cfg.h

@@ -802,106 +802,6 @@ enum hdd_dot11_mode {
 #define CFG_ADAPT_DWELL_WIFI_THRESH_MAX        (100)
 #define CFG_ADAPT_DWELL_WIFI_THRESH_DEFAULT    (10)
 
-#ifdef WLAN_FEATURE_11AX
-/* 11AX related INI configuration */
-/*
- * <ini>
- * he_dynamic_frag_support - configure dynamic fragmentation
- * @Min: 0
- * @Max: 3
- * @Default: 1
- *
- * This ini is used to configure dynamic fragmentation.
- *
- * Related: NA
- *
- * Supported Feature: 11AX
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_HE_DYNAMIC_FRAGMENTATION_NAME    "he_dynamic_frag_support"
-#define CFG_HE_DYNAMIC_FRAGMENTATION_MIN     (0)
-#define CFG_HE_DYNAMIC_FRAGMENTATION_MAX     (3)
-#define CFG_HE_DYNAMIC_FRAGMENTATION_DEFAULT (0)
-
-/*
- * <ini>
- * enable_ul_mimo- Enable UL MIMO.
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to enable or disable UL MIMO.
- *
- * Related: NA
- *
- * Supported Feature: 11AX
- *
- * Usage: External
- *
- * </ini>
- */
-
-#define CFG_ENABLE_UL_MIMO_NAME    "enable_ul_mimo"
-#define CFG_ENABLE_UL_MIMO_MIN     (0)
-#define CFG_ENABLE_UL_MIMO_MAX     (1)
-#define CFG_ENABLE_UL_MIMO_DEFAULT (0)
-
-/*
- * <ini>
- * enable_ul_ofdma- Enable UL OFDMA.
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to enable or disable UL OFDMA.
- *
- * Related: NA
- *
- * Supported Feature: 11AX
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_ENABLE_UL_OFDMA_NAME    "enable_ul_ofdma"
-#define CFG_ENABLE_UL_OFDMA_MIN     (0)
-#define CFG_ENABLE_UL_OFDMA_MAX     (1)
-#define CFG_ENABLE_UL_OFDMA_DEFAULT (0)
-
-/*
- * <ini>
- * he_sta_obsspd- 11AX HE OBSS PD bit field
- * @Min: 0
- * @Max: uin32_t max
- * @Default: 0x15b8c2ae
- *
- * 4 Byte value with each byte representing a signed value for following params:
- * Param                   Bit position    Default
- * OBSS_PD min (primary)   7:0             -82 (0xae)
- * OBSS_PD max (primary)   15:8            -62 (0xc2)
- * Secondary channel Ed    23:16           -72 (0xb8)
- * TX_PWR(ref)             31:24           21  (0x15)
- * This bit field value is directly applied to FW
- *
- * Related: NA
- *
- * Supported Feature: 11AX
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_HE_STA_OBSSPD_NAME    "he_sta_obsspd"
-#define CFG_HE_STA_OBSSPD_MIN     (0)
-#define CFG_HE_STA_OBSSPD_MAX     (0xffffffff)
-#define CFG_HE_STA_OBSSPD_DEFAULT (0x15b8c2ae)
-
-#endif /* WLAN_FEATURE_11AX */
-
 /*
  * <ini>
  * gScanBackoffMultiplier - For NLO/PNO, multiply fast scan period by this every
@@ -1145,12 +1045,6 @@ struct hdd_config {
 	uint8_t adapt_dwell_wifi_act_threshold;
 	uint16_t sap_tx_leakage_threshold;
 	bool sap_internal_restart;
-	uint8_t he_dynamic_frag_support;
-#ifdef WLAN_FEATURE_11AX
-	bool enable_ul_mimo;
-	bool enable_ul_ofdma;
-	uint32_t he_sta_obsspd;
-#endif
 	bool tx_orphan_enable;
 
 	uint8_t scan_backoff_multiplier;

core/hdd/inc/wlan_hdd_he.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019 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
@@ -104,16 +104,6 @@ void wlan_hdd_check_11ax_support(struct hdd_beacon_data *beacon,
  */
 int hdd_update_he_cap_in_cfg(struct hdd_context *hdd_ctx);
 
-/**
- * hdd_he_set_sme_config() - set HE related SME config param
- * @sme_config: pointer to SME config
- * @config: pointer to INI config
- *
- * Return: None
- */
-void hdd_he_set_sme_config(tSmeConfigParams *sme_config,
-			   struct hdd_config *config);
-
 /**
  * wlan_hdd_cfg80211_get_he_cap() - get HE Capabilities
  * @wiphy: Pointer to wiphy
@@ -151,11 +141,6 @@ static inline int hdd_update_he_cap_in_cfg(struct hdd_context *hdd_ctx)
 	return 0;
 }
 
-static inline void hdd_he_set_sme_config(tSmeConfigParams *sme_config,
-					 struct hdd_config *config)
-{
-}
-
 /* dummy definition */
 #define FEATURE_11AX_VENDOR_COMMANDS
 

core/hdd/src/wlan_hdd_cfg.c

@@ -277,35 +277,6 @@ struct reg_table_entry g_registry_table[] = {
 		CFG_ADAPT_DWELL_WIFI_THRESH_MIN,
 		CFG_ADAPT_DWELL_WIFI_THRESH_MAX),
 
-#ifdef WLAN_FEATURE_11AX
-	REG_VARIABLE(CFG_ENABLE_UL_MIMO_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, enable_ul_mimo,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_ENABLE_UL_MIMO_DEFAULT,
-		     CFG_ENABLE_UL_MIMO_MIN,
-		     CFG_ENABLE_UL_MIMO_MAX),
-
-	REG_VARIABLE(CFG_HE_DYNAMIC_FRAGMENTATION_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, he_dynamic_frag_support,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_HE_DYNAMIC_FRAGMENTATION_DEFAULT,
-		     CFG_HE_DYNAMIC_FRAGMENTATION_MIN,
-		     CFG_HE_DYNAMIC_FRAGMENTATION_MAX),
-
-	REG_VARIABLE(CFG_ENABLE_UL_OFDMA_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, enable_ul_ofdma,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_ENABLE_UL_OFDMA_DEFAULT,
-		     CFG_ENABLE_UL_OFDMA_MIN,
-		     CFG_ENABLE_UL_OFDMA_MAX),
-
-	REG_VARIABLE(CFG_HE_STA_OBSSPD_NAME, WLAN_PARAM_HexInteger,
-		     struct hdd_config, he_sta_obsspd,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_HE_STA_OBSSPD_DEFAULT,
-		     CFG_HE_STA_OBSSPD_MIN,
-		     CFG_HE_STA_OBSSPD_MAX),
-#endif
 	REG_VARIABLE(CFG_SCAN_BACKOFF_MULTIPLIER_NAME, WLAN_PARAM_Integer,
 		struct hdd_config, scan_backoff_multiplier,
 		VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -1924,8 +1895,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 
 	smeConfig->snr_monitor_enabled = hdd_ctx->config->fEnableSNRMonitoring;
 
-	hdd_he_set_sme_config(smeConfig, pConfig);
-
 	status = hdd_set_sme_cfgs_related_to_mlme(hdd_ctx, smeConfig);
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		hdd_err("hdd_set_sme_cfgs_related_to_mlme() fail: %d", status);

core/hdd/src/wlan_hdd_he.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019 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
@@ -96,13 +96,6 @@ int hdd_update_he_cap_in_cfg(struct hdd_context *hdd_ctx)
 	return ret;
 }
 
-void hdd_he_set_sme_config(tSmeConfigParams *sme_config,
-			   struct hdd_config *config)
-{
-	sme_config->csrConfig.enable_ul_ofdma = config->enable_ul_ofdma;
-	sme_config->csrConfig.enable_ul_mimo = config->enable_ul_mimo;
-}
-
 /*
  * __wlan_hdd_cfg80211_get_he_cap() - get HE Capabilities
  * @wiphy: Pointer to wiphy

core/sme/inc/csr_api.h

@@ -1046,10 +1046,6 @@ typedef struct tagCsrConfigParam {
 	struct csr_sta_roam_policy_params sta_roam_policy_params;
 	bool enable_bcast_probe_rsp;
 	bool is_fils_enabled;
-#ifdef WLAN_FEATURE_11AX
-	bool enable_ul_ofdma;
-	bool enable_ul_mimo;
-#endif
 	bool is_force_1x1;
 	uint8_t oce_feature_bitmap;
 	uint32_t offload_11k_enable_bitmask;

core/sme/inc/csr_internal.h

@@ -421,10 +421,6 @@ struct csr_config {
 	struct csr_sta_roam_policy_params sta_roam_policy;
 	bool enable_bcast_probe_rsp;
 	bool is_fils_enabled;
-#ifdef WLAN_FEATURE_11AX
-	bool enable_ul_ofdma;
-	bool enable_ul_mimo;
-#endif
 	bool is_force_1x1;
 	uint8_t oce_feature_bitmap;
 	uint32_t offload_11k_enable_bitmask;

core/sme/src/csr/csr_api_roam.c

@@ -2292,34 +2292,6 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState)
 					(_pmac)->he_cap_2g.bfee_sts_lt_80 :  \
 					(_pmac)->he_cap_5g.bfee_sts_lt_80
 
-/**
- * csr_update_he_config_param() - Update MAC context with HE config param
- * @mac_ctx: pointer to MAC context
- * @param: pointer to CSR config params
- *
- * Return: None
- */
-static void csr_update_he_config_param(struct mac_context *mac_ctx,
-				       tCsrConfigParam *param)
-{
-	mac_ctx->roam.configParam.enable_ul_ofdma = param->enable_ul_ofdma;
-	mac_ctx->roam.configParam.enable_ul_mimo = param->enable_ul_mimo;
-}
-
-/**
- * csr_get_he_config_param() - Get HE config param from MAC context
- * @param: pointer to CSR config params
- * @mac_ctx: pointer to MAC context
- *
- * Return: None
- */
-static void csr_get_he_config_param(tCsrConfigParam *param,
-				    struct mac_context *mac_ctx)
-{
-	param->enable_ul_ofdma = mac_ctx->roam.configParam.enable_ul_ofdma;
-	param->enable_ul_mimo = mac_ctx->roam.configParam.enable_ul_mimo;
-}
-
 
 /**
  * csr_join_req_copy_he_cap() - Copy HE cap into CSR Join Req
@@ -2376,16 +2348,6 @@ void csr_update_session_he_cap(struct mac_context *mac_ctx,
 #else
 #define CSR_REVISE_REQ_HE_CAP_PER_BAND(_req, _pmac, _channelid)   /* no op */
 
-static inline void csr_update_he_config_param(struct mac_context *mac_ctx,
-					      tCsrConfigParam *param)
-{
-}
-
-static inline void csr_get_he_config_param(tCsrConfigParam *param,
-					   struct mac_context *mac_ctx)
-{
-}
-
 static inline void csr_join_req_copy_he_cap(tSirSmeJoinReq *csr_join_req,
 			struct csr_roam_session *session)
 {
@@ -2632,7 +2594,6 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 		mac->roam.configParam.oce_feature_bitmap =
 			pParam->oce_feature_bitmap;
 
-		csr_update_he_config_param(mac, pParam);
 		csr_set_11k_offload_config_param(&mac->roam.configParam,
 						 pParam);
 	}
@@ -2742,8 +2703,6 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
 	pParam->oce_feature_bitmap =
 		mac->roam.configParam.oce_feature_bitmap;
 
-	csr_get_he_config_param(pParam, mac);
-
 	csr_get_11k_offload_config_param(&mac->roam.configParam, pParam);
 
 	return QDF_STATUS_SUCCESS;