From 17e1cb5cf4fc627e64653ded523aff287226a517 Mon Sep 17 00:00:00 2001
From: bings <bings@codeaurora.org>
Date: Fri, 8 Mar 2019 10:49:52 +0800
Subject: [PATCH] qcacmn: Replace CONFIG_MCL_REGDB with CONFIG_REG_CLIENT

Do not use MCL in the macro. Use feature name to define macro.

This is for CONFIG_MCL_REGDB cleanup.

Change-Id: I5a3f40da74e2c4476dbf2d4d4200502b9b9e9653
CRs-Fixed: 2411991
---
 umac/regulatory/core/src/reg_callbacks.h               | 2 +-
 umac/regulatory/core/src/reg_db.c                      | 2 +-
 umac/regulatory/core/src/reg_utils.h                   | 8 ++++----
 umac/regulatory/dispatcher/inc/wlan_reg_services_api.h | 2 +-
 umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/umac/regulatory/core/src/reg_callbacks.h b/umac/regulatory/core/src/reg_callbacks.h
index 29880b599b69..bf4b62789c23 100644
--- a/umac/regulatory/core/src/reg_callbacks.h
+++ b/umac/regulatory/core/src/reg_callbacks.h
@@ -25,7 +25,7 @@
 #ifndef __REG_CALLBKS_H_
 #define __REG_CALLBKS_H_
 
-#ifdef CONFIG_MCL_REGDB
+#ifdef CONFIG_REG_CLIENT
 /**
  * reg_register_chan_change_callback() - Register channel change callbacks
  * @psoc: Pointer to psoc
diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c
index 3c78e2d94747..9aff026ad0bd 100644
--- a/umac/regulatory/core/src/reg_db.c
+++ b/umac/regulatory/core/src/reg_db.c
@@ -281,7 +281,7 @@ enum reg_domain {
 	WORLD_6C = 0x6C,
 };
 
-#ifndef CONFIG_MCL_REGDB
+#ifndef CONFIG_REG_CLIENT
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", 40, 160, 0},
 	{CTRY_ALBANIA, ETSI1_WORLD, "AL", 40, 160, 0},
diff --git a/umac/regulatory/core/src/reg_utils.h b/umac/regulatory/core/src/reg_utils.h
index 9e7ce89ce3bd..8f18dae7881c 100644
--- a/umac/regulatory/core/src/reg_utils.h
+++ b/umac/regulatory/core/src/reg_utils.h
@@ -42,7 +42,7 @@
 	 - REG_CH_TO_FREQ(reg_get_chan_enum(curchan))	\
 	 > REG_SBS_SEPARATION_THRESHOLD)
 
-#ifdef CONFIG_MCL_REGDB
+#ifdef CONFIG_REG_CLIENT
 /**
  * reg_chan_has_dfs_attribute() - check channel has dfs attribue or not
  * @ch: channel number.
@@ -385,7 +385,7 @@ bool reg_ignore_default_country(struct wlan_regulatory_psoc_priv_obj *soc_reg,
 }
 #endif
 
-#if defined(WLAN_FEATURE_DSRC) && defined(CONFIG_MCL_REGDB)
+#if defined(WLAN_FEATURE_DSRC) && defined(CONFIG_REG_CLIENT)
 /**
  * reg_is_dsrc_chan () - Checks the channel for DSRC or not
  * @chan: channel
@@ -411,7 +411,7 @@ reg_is_etsi13_srd_chan_allowed_master_mode(struct wlan_objmgr_pdev *pdev)
 {
 	return true;
 }
-#elif defined(CONFIG_MCL_REGDB)
+#elif defined(CONFIG_REG_CLIENT)
 static inline bool reg_is_dsrc_chan(struct wlan_objmgr_pdev *pdev,
 				    uint32_t chan)
 {
@@ -469,7 +469,7 @@ static inline bool reg_is_etsi13_srd_chan(struct wlan_objmgr_pdev *pdev,
 }
 #endif
 
-#if defined(DISABLE_CHANNEL_LIST) && defined(CONFIG_MCL_REGDB)
+#if defined(DISABLE_CHANNEL_LIST) && defined(CONFIG_REG_CLIENT)
 /**
  * set_disable_channel_state() - Set disable channel state flag
  * @pdev_priv_obj: Pointer to pdev object
diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
index bf4f632683ff..dc91439dded8 100644
--- a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
+++ b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
@@ -177,7 +177,7 @@ QDF_STATUS wlan_reg_get_channel_list_with_power(struct wlan_objmgr_pdev *pdev,
 QDF_STATUS wlan_reg_read_default_country(struct wlan_objmgr_psoc *psoc,
 				   uint8_t *country);
 
-#ifdef CONFIG_MCL_REGDB
+#ifdef CONFIG_REG_CLIENT
 /**
  * wlan_reg_read_current_country() - Read the current country for the regdomain
  * @country: pointer to the country code.
diff --git a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c
index 801dfefafc7b..5db92700f995 100644
--- a/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c
+++ b/umac/regulatory/dispatcher/src/wlan_reg_ucfg_api.c
@@ -116,7 +116,7 @@ QDF_STATUS ucfg_reg_get_current_cc(struct wlan_objmgr_pdev *pdev,
 	return reg_get_current_cc(pdev, rd);
 }
 
-#ifdef CONFIG_MCL_REGDB
+#ifdef CONFIG_REG_CLIENT
 /**
  * ucfg_reg_set_band() - Sets the band information for the PDEV
  * @pdev: The physical pdev to set the band for