qcacld-3.0: Remove unused INI parameters

As part of CFG convergence, few INI parameters
were moved to under the CFG module but were
not cleaned up in the wlan_hdd_cfg files.

Cleanup the wlan_hdd_cfg files by removing
unused INI parameters

Change-Id: I8b90d11d613485d17fcfe7c4157001b7415f8cc8
CRs-Fixed: 2347108

core/hdd/inc/wlan_hdd_cfg.h

@@ -2387,47 +2387,6 @@ enum hdd_dot11_mode {
 #define CFG_AP_OBSS_PROTECTION_MODE_MAX        (1)
 #define CFG_AP_OBSS_PROTECTION_MODE_DEFAULT    (0)
 
-/*
- * <ini>
- * gDisableIntraBssFwd - Disable intra BSS Rx packets
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to disable forwarding of Intra-BSS Rx packets when
- * ap_isolate=1 in hostapd.conf
- *
- * Related: None.
- *
- * Supported Feature: SAP
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_AP_STA_SECURITY_SEPERATION_NAME    "gDisableIntraBssFwd"
-#define CFG_AP_STA_SECURITY_SEPERATION_MIN     (0)
-#define CFG_AP_STA_SECURITY_SEPERATION_MAX     (1)
-#define CFG_AP_STA_SECURITY_SEPERATION_DEFAULT (0)
-
-/*
- * <ini>
- * gDisablePacketFilter - Disabling of packet filter support
- * @Min: 0
- * @Max: 1
- * @Default: 1
- *
- * This ini is used to disable packet filter support when set to 1.
- *
- * Related: None.
- *
- * Supported Feature: SAP
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
 #define CFG_DISABLE_PACKET_FILTER		"gDisablePacketFilter"
 #define CFG_DISABLE_PACKET_FILTER_MIN		(0)
 #define CFG_DISABLE_PACKET_FILTER_MAX		(1)
@@ -4050,59 +4009,6 @@ enum hdd_link_speed_rpt_type {
 #define CFG_SET_TXPOWER_LIMIT5G_MAX                (30)
 #define CFG_SET_TXPOWER_LIMIT5G_DEFAULT            (30)
 
-#ifdef QCA_LL_TX_FLOW_CONTROL_V2
-
-/*
- * <ini>
- * TxFlowStopQueueThreshold - Stop queue Threshold to pause
- *                            Netif queues when it reaches
- * @Min: 0
- * @Max: 50
- * @Default: 15
- *
- * This ini specifies the threshold of data packets transmitted
- * before pausing netif queues.
- *
- * Related: TxFlowStartQueueOffset
- *
- * Supported Feature: Dynamic Flow Control
- *
- * Usage: Internal
- *
- * </ini>
- */
-#define CFG_LL_TX_FLOW_STOP_QUEUE_TH               "TxFlowStopQueueThreshold"
-#define CFG_LL_TX_FLOW_STOP_QUEUE_TH_DEFAULT       (15)
-#define CFG_LL_TX_FLOW_STOP_QUEUE_TH_MIN           (0)
-#define CFG_LL_TX_FLOW_STOP_QUEUE_TH_MAX           (50)
-
-/*
- * <ini>
- * TxFlowStartQueueOffset - Start queue offset to unpause
- *                          Netif queues
- * @Min: 0
- * @Max: 30
- * @Default: 11
- *
- * This ini specifies the offset to upause the netif queues
- * when they are paused due to insufficient descriptors as guided by
- * ini TxFlowStopQueueThreshold.
- *
- * Related: TxFlowStopQueueThreshold
- *
- * Supported Feature: Dynamic Flow Control
- *
- * Usage: Internal
- *
- * </ini>
- */
-#define CFG_LL_TX_FLOW_START_QUEUE_OFFSET          "TxFlowStartQueueOffset"
-#define CFG_LL_TX_FLOW_START_QUEUE_OFFSET_DEFAULT  (10)
-#define CFG_LL_TX_FLOW_START_QUEUE_OFFSET_MIN      (0)
-#define CFG_LL_TX_FLOW_START_QUEUE_OFFSET_MAX      (30)
-
-#endif /* QCA_LL_TX_FLOW_CONTROL_V2 */
-
 #ifdef FEATURE_WLAN_RA_FILTERING
 #define CFG_RA_RATE_LIMIT_INTERVAL_NAME            "gRArateLimitInterval"
 #define CFG_RA_RATE_LIMIT_INTERVAL_MIN             (60)
@@ -4257,29 +4163,6 @@ enum hdd_link_speed_rpt_type {
 #define CFG_DFS_RADAR_PRI_MULTIPLIER_MIN           (0)
 #define CFG_DFS_RADAR_PRI_MULTIPLIER_MAX           (10)
 
-/*
- * <ini>
- * gReorderOffloadSupported - Packet reordering offload to firmware
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to set default Packet reordering
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_REORDER_OFFLOAD_SUPPORT_NAME    "gReorderOffloadSupported"
-#define CFG_REORDER_OFFLOAD_SUPPORT_MIN     (0)
-#define CFG_REORDER_OFFLOAD_SUPPORT_MAX     (1)
-#define CFG_REORDER_OFFLOAD_SUPPORT_DEFAULT (1)
-
 #define CFG_ENABLE_SAP_SUSPEND                     "gEnableSapSuspend"
 #define CFG_ENABLE_SAP_SUSPEND_MIN                 (0)
 #define CFG_ENABLE_SAP_SUSPEND_MAX                 (1)
@@ -6633,7 +6516,6 @@ struct hdd_config {
 	bool apProtEnabled;
 	uint16_t apProtection;
 	bool apOBSSProtEnabled;
-	bool apDisableIntraBssFwd;
 	enum station_keepalive_method sta_keepalive_method;
 	uint8_t nTxPowerCap;    /* In dBm */
 	bool allow_tpc_from_ap;
@@ -6840,10 +6722,6 @@ struct hdd_config {
 	uint8_t gDisableDfsJapanW53;
 	bool gEnableOverLapCh;
 	bool fRegChangeDefCountry;
-#ifdef QCA_LL_TX_FLOW_CONTROL_V2
-	uint32_t TxFlowStopQueueThreshold;
-	uint32_t TxFlowStartQueueOffset;
-#endif
 	bool advertiseConcurrentOperation;
 
 	uint8_t allowDFSChannelRoam;
@@ -6855,7 +6733,6 @@ struct hdd_config {
 	bool enable_sap_mandatory_chan_list;
 
 	int32_t dfsRadarPriMultiplier;
-	uint8_t reorderOffloadSupport;
 
 #ifdef FEATURE_WLAN_FORCE_SAP_SCC
 	uint8_t SapSccChanAvoidance;

core/hdd/src/wlan_hdd_cfg.c

@@ -547,13 +547,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_AP_OBSS_PROTECTION_MODE_MIN,
 		     CFG_AP_OBSS_PROTECTION_MODE_MAX),
 
-	REG_VARIABLE(CFG_AP_STA_SECURITY_SEPERATION_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, apDisableIntraBssFwd,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_AP_STA_SECURITY_SEPERATION_DEFAULT,
-		     CFG_AP_STA_SECURITY_SEPERATION_MIN,
-		     CFG_AP_STA_SECURITY_SEPERATION_MAX),
-
 #ifdef FEATURE_WLAN_DYNAMIC_CVM
 	REG_VARIABLE(CFG_VC_MODE_BITMAP, WLAN_PARAM_HexInteger,
 		struct hdd_config, vc_mode_cfg_bitmap,
@@ -1575,23 +1568,7 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_REG_CHANGE_DEF_COUNTRY_DEFAULT,
 		     CFG_REG_CHANGE_DEF_COUNTRY_MIN,
 		     CFG_REG_CHANGE_DEF_COUNTRY_MAX),
-#ifdef QCA_LL_TX_FLOW_CONTROL_V2
 
-	REG_VARIABLE(CFG_LL_TX_FLOW_STOP_QUEUE_TH, WLAN_PARAM_Integer,
-		     struct hdd_config, TxFlowStopQueueThreshold,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_LL_TX_FLOW_STOP_QUEUE_TH_DEFAULT,
-		     CFG_LL_TX_FLOW_STOP_QUEUE_TH_MIN,
-		     CFG_LL_TX_FLOW_STOP_QUEUE_TH_MAX),
-
-	REG_VARIABLE(CFG_LL_TX_FLOW_START_QUEUE_OFFSET, WLAN_PARAM_Integer,
-		     struct hdd_config, TxFlowStartQueueOffset,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_LL_TX_FLOW_START_QUEUE_OFFSET_DEFAULT,
-		     CFG_LL_TX_FLOW_START_QUEUE_OFFSET_MIN,
-		     CFG_LL_TX_FLOW_START_QUEUE_OFFSET_MAX),
-
-#endif
 	REG_VARIABLE(CFG_INITIAL_DWELL_TIME_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, nInitialDwellTime,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -1647,13 +1624,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_DFS_RADAR_PRI_MULTIPLIER_MIN,
 		     CFG_DFS_RADAR_PRI_MULTIPLIER_MAX),
 
-	REG_VARIABLE(CFG_REORDER_OFFLOAD_SUPPORT_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, reorderOffloadSupport,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_REORDER_OFFLOAD_SUPPORT_DEFAULT,
-		     CFG_REORDER_OFFLOAD_SUPPORT_MIN,
-		     CFG_REORDER_OFFLOAD_SUPPORT_MAX),
-
 	REG_VARIABLE(CFG_ENABLE_SAP_SUSPEND, WLAN_PARAM_Integer,
 		     struct hdd_config, enable_sap_suspend,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,

core/hdd/src/wlan_hdd_main.c

@@ -9617,9 +9617,9 @@ static inline void hdd_txrx_populate_cds_config(struct cds_config_info
 						struct hdd_context *hdd_ctx)
 {
 	cds_cfg->tx_flow_stop_queue_th =
-		hdd_ctx->config->TxFlowStopQueueThreshold;
+		cfg_get(hdd_ctx->psoc, CFG_DP_TX_FLOW_STOP_QUEUE_TH);
 	cds_cfg->tx_flow_start_queue_offset =
-		hdd_ctx->config->TxFlowStartQueueOffset;
+		cfg_get(hdd_ctx->psoc, CFG_DP_TX_FLOW_START_QUEUE_OFFSET);
 	/* configuration for DP RX Threads */
 	cds_cfg->enable_dp_rx_threads = hdd_ctx->enable_dp_rx_threads;
 	cds_cfg->num_dp_rx_threads = hdd_ctx->config->num_dp_rx_threads;
@@ -9730,12 +9730,12 @@ static int hdd_update_cds_config(struct hdd_context *hdd_ctx)
 	cds_cfg->ap_maxoffload_reorderbuffs = value;
 
 	cds_cfg->ap_disable_intrabss_fwd =
-		hdd_ctx->config->apDisableIntraBssFwd;
+		cfg_get(hdd_ctx->psoc, CFG_DP_AP_STA_SECURITY_SEPERATION);
 
 	cds_cfg->dfs_pri_multiplier =
 		hdd_ctx->config->dfsRadarPriMultiplier;
 	cds_cfg->reorder_offload =
-			hdd_ctx->config->reorderOffloadSupport;
+			cfg_get(hdd_ctx->psoc, CFG_DP_REORDER_OFFLOAD_SUPPORT);
 
 	/* IPA micro controller data path offload resource config item */
 	cds_cfg->uc_offload_enabled = ucfg_ipa_uc_is_enabled();
@@ -13935,9 +13935,10 @@ static int hdd_update_dp_config(struct hdd_context *hdd_ctx)
 	params.lro_enable = cfg_get(hdd_ctx->psoc, CFG_DP_LRO);
 #ifdef QCA_LL_TX_FLOW_CONTROL_V2
 	params.tx_flow_stop_queue_threshold =
-			hdd_ctx->config->TxFlowStopQueueThreshold;
+			cfg_get(hdd_ctx->psoc, CFG_DP_TX_FLOW_STOP_QUEUE_TH);
 	params.tx_flow_start_queue_offset =
-			hdd_ctx->config->TxFlowStartQueueOffset;
+			cfg_get(hdd_ctx->psoc,
+				CFG_DP_TX_FLOW_START_QUEUE_OFFSET);
 #endif
 	params.flow_steering_enable =
 		cfg_get(hdd_ctx->psoc, CFG_DP_FLOW_STEERING_ENABLED);