qcacld-3.0: Remove the file cds_regdomain_common.h
Data structures defined in cds_regdomain_common.h are similar
to those defined in cds_regdomain.h. Therefore remove the file.
Change-Id: I929b03058e9441e4a652314789cf91dbd94d0329
CRs-Fixed: 961806
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 56963ef..2737f9e 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -45,6 +45,7 @@
#include "sir_mac_prot_def.h"
#include "ani_system_defs.h"
#include "sir_params.h"
+#include "cds_regdomain.h"
#define OFFSET_OF(structType, fldName) (&((structType *)0)->fldName)
@@ -3417,7 +3418,7 @@
uint8_t supportedChannelsLen;
uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS];
uint8_t supportedOperClassesLen;
- uint8_t supportedOperClasses[SIR_MAC_MAX_SUPP_OPER_CLASSES];
+ uint8_t supportedOperClasses[CDS_MAX_SUPP_OPER_CLASSES];
} tSirTdlsLinkEstablishReq, *tpSirTdlsLinkEstablishReq;
/* TDLS Request struct SME-->PE */
diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h
index 8ffaf01..c675af7 100644
--- a/core/mac/inc/sir_mac_prot_def.h
+++ b/core/mac/inc/sir_mac_prot_def.h
@@ -1385,7 +1385,6 @@
#define SIR_MAC_MAX_SUPP_RATES 32
#define SIR_MAC_MAX_SUPP_CHANNELS 100
-#define SIR_MAC_MAX_SUPP_OPER_CLASSES 32
#define SIR_MAC_MAX_EXTN_CAP 8
/* VHT Capabilities Info */
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 679cee4..c0bab96 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -62,7 +62,7 @@
#include <lim_ft.h>
-#include "cds_regdomain_common.h"
+#include "cds_regdomain.h"
/*
* This overhead is time for sending NOA start to host in case of GO/sending
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index 44973cd..5bf81e6 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -75,7 +75,7 @@
#include "lim_assoc_utils.h"
#include "dph_hash_table.h"
#include "wma_types.h"
-#include "cds_regdomain_common.h"
+#include "cds_regdomain.h"
/* define NO_PAD_TDLS_MIN_8023_SIZE to NOT padding: See CR#447630
There was IOT issue with cisco 1252 open mode, where it pads
@@ -2556,7 +2556,7 @@
uint8_t chanOffset;
uint8_t op_class;
uint8_t numClasses;
- uint8_t classes[SIR_MAC_MAX_SUPP_OPER_CLASSES];
+ uint8_t classes[CDS_MAX_SUPP_OPER_CLASSES];
if (wlan_cfg_get_str(pMac, WNI_CFG_VALID_CHANNEL_LIST,
validChan, &numChans) != eSIR_SUCCESS) {
/**
diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c
index 3c844b8..5741165 100644
--- a/core/mac/src/pe/lim/lim_send_messages.c
+++ b/core/mac/src/pe/lim/lim_send_messages.c
@@ -42,7 +42,7 @@
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
#include "host_diag_core_log.h"
#endif /* FEATURE_WLAN_DIAG_SUPPORT */
-#include "cds_regdomain_common.h"
+
/* When beacon filtering is enabled, firmware will
* analyze the selected beacons received during BMPS,
* and monitor any changes in the IEs as listed below.
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 9f9a145..17d4492 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -55,7 +55,7 @@
#include "lim_session_utils.h"
#include "lim_types.h"
#include "sir_api.h"
-#include "cds_regdomain_common.h"
+#include "cds_regdomain.h"
#include "lim_send_messages.h"
static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
index fbe4063..80c7a66 100644
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
@@ -47,7 +47,7 @@
#include "wmm_apsd.h"
#include "rrm_api.h"
-#include "cds_regdomain_common.h"
+#include "cds_regdomain.h"
/* ////////////////////////////////////////////////////////////////////// */
void dot11f_log(tpAniSirGlobal pMac, int loglevel, const char *pString, ...)