From dc6d68a6ea50b6be03aa61a4c59dc304c19e05e2 Mon Sep 17 00:00:00 2001
From: Sandeep Puligilla <spuligil@codeaurora.org>
Date: Fri, 4 Jan 2019 16:57:12 -0800
Subject: [PATCH] qcacld-3.0: Refactor CFG item
 CFG_ADVERTISE_CONCURRENT_OPERATION

Refactor CFG item CFG_ADVERTISE_CONCURRENT_OPERATION

Change-Id: Iadd46a2882b14010786afbf8c626bdbf96fae486
CRs-Fixed: 2378457
---
 core/hdd/inc/hdd_config.h    | 24 ++++++++++++++++++++++++
 core/hdd/inc/wlan_hdd_cfg.h  | 24 ------------------------
 core/hdd/src/wlan_hdd_cfg.c  |  9 ---------
 core/hdd/src/wlan_hdd_main.c |  3 +++
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/core/hdd/inc/hdd_config.h b/core/hdd/inc/hdd_config.h
index 96e42be62dac..ed1d8b91b1df 100644
--- a/core/hdd/inc/hdd_config.h
+++ b/core/hdd/inc/hdd_config.h
@@ -1074,6 +1074,29 @@ enum hdd_wext_control {
 		1, \
 		"The param is used to enable/disable support for RTT")
 
+/*
+ * <ini>
+ * gAdvertiseConcurrentOperation - Iface combination advertising
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to control whether driver should indicate to kernel
+ * wiphy layer the combination of all its interfaces' supportability.
+ *
+ * Related: None
+ *
+ * Supported Feature: STA
+ *
+ * Usage: Internal/External
+ *
+ * </ini>
+ */
+#define CFG_ADVERTISE_CONCURRENT_OPERATION CFG_INI_BOOL( \
+		"gAdvertiseConcurrentOperation", \
+		1, \
+		"Iface combination advertising")
+
 #define CFG_HDD_ALL \
 	CFG_ENABLE_PACKET_LOG_ALL \
 	CFG_ENABLE_RUNTIME_PM_ALL \
@@ -1087,6 +1110,7 @@ enum hdd_wext_control {
 	CFG(CFG_ACTION_OUI_ITO_EXTENSION) \
 	CFG(CFG_ACTION_OUI_DISABLE_AGGRESSIVE_TX) \
 	CFG(CFG_ACTION_OUI_SWITCH_TO_11N_MODE) \
+	CFG(CFG_ADVERTISE_CONCURRENT_OPERATION) \
 	CFG(CFG_BUG_ON_REINIT_FAILURE) \
 	CFG(CFG_DBS_SCAN_SELECTION) \
 	CFG(CFG_DERIVED_INTERFACE_POOL) \
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 8bbbf94e638e..ea6e1899c100 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -99,30 +99,6 @@ struct hdd_context;
  #define CFG_ENABLE_11D_IN_WORLD_MODE_MAX     (1)
  #define CFG_ENABLE_11D_IN_WORLD_MODE_DEFAULT (0)
 
-/*
- * <ini>
- * gAdvertiseConcurrentOperation - Iface combination advertising
- * @Min: 0
- * @Max: 1
- * @Default: 1
- *
- * This ini is used to control whether driver should indicate to kernel
- * wiphy layer the combination of all its interfaces' supportability.
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_ADVERTISE_CONCURRENT_OPERATION_NAME    "gAdvertiseConcurrentOperation"
-#define CFG_ADVERTISE_CONCURRENT_OPERATION_DEFAULT (1)
-#define CFG_ADVERTISE_CONCURRENT_OPERATION_MIN     (0)
-#define CFG_ADVERTISE_CONCURRENT_OPERATION_MAX     (1)
-
 enum hdd_dot11_mode {
 	eHDD_DOT11_MODE_AUTO = 0,       /* covers all things we support */
 	eHDD_DOT11_MODE_abg,    /* 11a/b/g only, no HT, no proprietary */
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 8d67c79348c7..c16271abf99a 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -134,15 +134,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_PNO_SLOW_SCAN_MULTIPLIER_MIN,
 		     CFG_PNO_SLOW_SCAN_MULTIPLIER_MAX),
 #endif
-
-	REG_VARIABLE(CFG_ADVERTISE_CONCURRENT_OPERATION_NAME,
-		     WLAN_PARAM_Integer,
-		     struct hdd_config, advertiseConcurrentOperation,
-		     VAR_FLAGS_OPTIONAL,
-		     CFG_ADVERTISE_CONCURRENT_OPERATION_DEFAULT,
-		     CFG_ADVERTISE_CONCURRENT_OPERATION_MIN,
-		     CFG_ADVERTISE_CONCURRENT_OPERATION_MAX),
-
 #ifdef DHCP_SERVER_OFFLOAD
 	REG_VARIABLE_STRING(CFG_DHCP_SERVER_IP_NAME, WLAN_PARAM_String,
 			    struct hdd_config, dhcpServerIP,
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index b0e5970e25b4..9c515fd26577 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -9421,6 +9421,9 @@ static void hdd_cfg_params_init(struct hdd_context *hdd_ctx)
 				cfg_get(psoc, CFG_PROVISION_INTERFACE_POOL);
 	config->derived_intf_pool = cfg_get(psoc, CFG_DERIVED_INTERFACE_POOL);
 	config->action_oui_enable = cfg_get(psoc, CFG_ENABLE_ACTION_OUI);
+	config->advertiseConcurrentOperation =
+				cfg_get(psoc,
+					CFG_ADVERTISE_CONCURRENT_OPERATION);
 	qdf_str_lcopy(config->action_oui_str[0],
 		      cfg_get(psoc, CFG_ACTION_OUI_CONNECT_1X1),
 			      ACTION_OUI_MAX_STR_LEN);