From 2ea97ac98512848a8d721c76dddf82576e7c417e Mon Sep 17 00:00:00 2001
From: Amruta Kulkarni <amrukulk@codeaurora.org>
Date: Wed, 12 May 2021 14:22:32 -0700
Subject: [PATCH] qcacmn: Change file names to cfg_*.h

Change file names from wlan_cfg_*.h to cfg_*.h

Change-Id: Id89dc307c08fc55f1777794453f2168755b5506d
CRs-Fixed: 2856372
---
 cfg/inc/cfg_converged.h                                   | 8 ++++----
 umac/dcs/dispatcher/inc/{wlan_dcs_cfg.h => cfg_dcs.h}     | 2 +-
 umac/dcs/dispatcher/src/wlan_dcs_init_deinit_api.c        | 4 ++--
 umac/scan/core/src/wlan_scan_main.h                       | 2 +-
 umac/scan/core/src/wlan_scan_manager.c                    | 2 +-
 .../dispatcher/inc/{wlan_extscan_cfg.h => cfg_extscan.h}  | 6 +++---
 umac/scan/dispatcher/inc/{wlan_scan_cfg.h => cfg_scan.h}  | 0
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename umac/dcs/dispatcher/inc/{wlan_dcs_cfg.h => cfg_dcs.h} (98%)
 rename umac/scan/dispatcher/inc/{wlan_extscan_cfg.h => cfg_extscan.h} (96%)
 rename umac/scan/dispatcher/inc/{wlan_scan_cfg.h => cfg_scan.h} (100%)

diff --git a/cfg/inc/cfg_converged.h b/cfg/inc/cfg_converged.h
index a79d6be2b8..1595b6da2a 100644
--- a/cfg/inc/cfg_converged.h
+++ b/cfg/inc/cfg_converged.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021 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
@@ -23,11 +23,11 @@
 #ifndef __CFG_CONVERGED_H
 #define __CFG_CONVERGED_H
 
-#include <wlan_scan_cfg.h>
+#include <cfg_scan.h>
 #include "cfg_mlme_score_params.h"
 #include "cfg_dp.h"
 #include "cfg_hif.h"
-#include <wlan_extscan_cfg.h>
+#include <cfg_extscan.h>
 #ifdef WLAN_SUPPORT_GREEN_AP
 #include "cfg_green_ap_params.h"
 #else
@@ -35,7 +35,7 @@
 #endif
 #include <cfg_spectral.h>
 #ifdef DCS_INTERFERENCE_DETECTION
-#include "wlan_dcs_cfg.h"
+#include "cfg_dcs.h"
 #else
 #define CFG_DCS_ALL
 #endif
diff --git a/umac/dcs/dispatcher/inc/wlan_dcs_cfg.h b/umac/dcs/dispatcher/inc/cfg_dcs.h
similarity index 98%
rename from umac/dcs/dispatcher/inc/wlan_dcs_cfg.h
rename to umac/dcs/dispatcher/inc/cfg_dcs.h
index 51a36dbf45..752870412e 100644
--- a/umac/dcs/dispatcher/inc/wlan_dcs_cfg.h
+++ b/umac/dcs/dispatcher/inc/cfg_dcs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020-2021, 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 above
diff --git a/umac/dcs/dispatcher/src/wlan_dcs_init_deinit_api.c b/umac/dcs/dispatcher/src/wlan_dcs_init_deinit_api.c
index 46c2e175f1..6cfeff9210 100644
--- a/umac/dcs/dispatcher/src/wlan_dcs_init_deinit_api.c
+++ b/umac/dcs/dispatcher/src/wlan_dcs_init_deinit_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020-2021, 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 above
@@ -20,7 +20,7 @@
 
 #include "wlan_dcs_init_deinit_api.h"
 #include "../../core/src/wlan_dcs.h"
-#include "wlan_dcs_cfg.h"
+#include "cfg_dcs.h"
 #include "cfg_ucfg_api.h"
 
 /**
diff --git a/umac/scan/core/src/wlan_scan_main.h b/umac/scan/core/src/wlan_scan_main.h
index 0454f2a7b4..f69f24dafc 100644
--- a/umac/scan/core/src/wlan_scan_main.h
+++ b/umac/scan/core/src/wlan_scan_main.h
@@ -30,7 +30,7 @@
 #include <wlan_scan_public_structs.h>
 #include "wlan_scan_cache_db.h"
 #include "wlan_scan_11d.h"
-#include "wlan_scan_cfg.h"
+#include "cfg_scan.h"
 
 #define scm_alert(params...) \
 	QDF_TRACE_FATAL(QDF_MODULE_ID_SCAN, params)
diff --git a/umac/scan/core/src/wlan_scan_manager.c b/umac/scan/core/src/wlan_scan_manager.c
index 05e283b348..4f179e94be 100644
--- a/umac/scan/core/src/wlan_scan_manager.c
+++ b/umac/scan/core/src/wlan_scan_manager.c
@@ -34,7 +34,7 @@
 #include <wlan_policy_mgr_api.h>
 #endif
 #include <wlan_dfs_utils_api.h>
-#include <wlan_scan_cfg.h>
+#include <cfg_scan.h>
 
 QDF_STATUS
 scm_scan_free_scan_request_mem(struct scan_start_request *req)
diff --git a/umac/scan/dispatcher/inc/wlan_extscan_cfg.h b/umac/scan/dispatcher/inc/cfg_extscan.h
similarity index 96%
rename from umac/scan/dispatcher/inc/wlan_extscan_cfg.h
rename to umac/scan/dispatcher/inc/cfg_extscan.h
index c10dd95954..4a44879af1 100644
--- a/umac/scan/dispatcher/inc/wlan_extscan_cfg.h
+++ b/umac/scan/dispatcher/inc/cfg_extscan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 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
@@ -19,8 +19,8 @@
 /**
  * DOC: This file contains centralized definitions of EXTSCAN component
  */
-#ifndef _WLAN_EXTSCAN_CONFIG_H_
-#define _WLAN_EXTSCAN_CONFIG_H_
+#ifndef _CONFIG_EXTSCAN_H_
+#define _CONFIG_EXTSCAN_H_
 
 #include "cfg_define.h"
 
diff --git a/umac/scan/dispatcher/inc/wlan_scan_cfg.h b/umac/scan/dispatcher/inc/cfg_scan.h
similarity index 100%
rename from umac/scan/dispatcher/inc/wlan_scan_cfg.h
rename to umac/scan/dispatcher/inc/cfg_scan.h