From 747b176c98d80b730026d66d1897dc763c803310 Mon Sep 17 00:00:00 2001
From: bings <bings@codeaurora.org>
Date: Fri, 21 Sep 2018 10:48:26 +0800
Subject: [PATCH] qcacmn: Replace wlan_phy_ch_width with phy_ch_width

Delete enum wlan_phy_ch_width. Move phy_ch_width definition
from reg_services_public_struct.h to wlan_cmn.h.

Change-Id: I9f2b3ade1b023b9728274ce4edd3b90f562ae02e
CRs-Fixed: 2318356
---
 umac/cmn_services/inc/wlan_cmn.h              | 40 +++++++++----------
 .../obj_mgr/inc/wlan_objmgr_vdev_obj.h        |  2 +-
 .../inc/reg_services_public_struct.h          | 26 +-----------
 3 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h
index 9deffaf044..12cba04c52 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -371,27 +371,27 @@ enum wlan_phymode {
 #define WLAN_PHYMODE_MAX      (WLAN_PHYMODE_11AXA_HE80_80 + 1)
 
 /**
- * enum wlan_phy_ch_width - channel width
- * @WLAN_CH_WIDTH_20MHZ: 20 mhz width
- * @WLAN_CH_WIDTH_40MHZ: 40 mhz width
- * @WLAN_CH_WIDTH_80MHZ: 80 mhz width
- * @WLAN_CH_WIDTH_160MHZ: 160 mhz width
- * @WLAN_CH_WIDTH_80P80HZ: 80+80 mhz width
- * @WLAN_CH_WIDTH_5MHZ: 5 mhz width
- * @WLAN_CH_WIDTH_10MHZ: 10 mhz width
- * @WLAN_CH_WIDTH_INVALID: invalid width
- * @WLAN_CH_WIDTH_MAX: max possible width
+ * enum phy_ch_width - channel width
+ * @CH_WIDTH_20MHZ: 20 mhz width
+ * @CH_WIDTH_40MHZ: 40 mhz width
+ * @CH_WIDTH_80MHZ: 80 mhz width
+ * @CH_WIDTH_160MHZ: 160 mhz width
+ * @CH_WIDTH_80P80HZ: 80+80 mhz width
+ * @CH_WIDTH_5MHZ: 5 mhz width
+ * @CH_WIDTH_10MHZ: 10 mhz width
+ * @CH_WIDTH_INVALID: invalid width
+ * @CH_WIDTH_MAX: max possible width
  */
-enum wlan_phy_ch_width {
-	WLAN_CH_WIDTH_20MHZ = 0,
-	WLAN_CH_WIDTH_40MHZ,
-	WLAN_CH_WIDTH_80MHZ,
-	WLAN_CH_WIDTH_160MHZ,
-	WLAN_CH_WIDTH_80P80MHZ,
-	WLAN_CH_WIDTH_5MHZ,
-	WLAN_CH_WIDTH_10MHZ,
-	WLAN_CH_WIDTH_INVALID,
-	WLAN_CH_WIDTH_MAX
+enum phy_ch_width {
+	CH_WIDTH_20MHZ = 0,
+	CH_WIDTH_40MHZ,
+	CH_WIDTH_80MHZ,
+	CH_WIDTH_160MHZ,
+	CH_WIDTH_80P80MHZ,
+	CH_WIDTH_5MHZ,
+	CH_WIDTH_10MHZ,
+	CH_WIDTH_INVALID,
+	CH_WIDTH_MAX
 };
 
 /**
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
index 14f84804f6..b42434d04b 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
@@ -257,7 +257,7 @@ struct wlan_channel {
 	int8_t       ch_maxpower;
 	uint8_t      ch_freq_seg1;
 	uint8_t      ch_freq_seg2;
-	enum wlan_phy_ch_width ch_width;
+	enum phy_ch_width ch_width;
 	enum wlan_phymode ch_phymode;
 };
 
diff --git a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h
index 86f6539298..92dffc580c 100644
--- a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h
+++ b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h
@@ -25,6 +25,7 @@
 #define __REG_SERVICES_PUBLIC_STRUCT_H_
 
 #include "../../core/src/reg_db.h"
+#include "wlan_cmn.h"
 
 #define REG_SBS_SEPARATION_THRESHOLD 100
 #define REG_MAX_CHANNELS_PER_OPERATING_CLASS  25
@@ -509,31 +510,6 @@ typedef enum {
 	REGDOMAIN_COUNT
 } v_REGDOMAIN_t;
 
-
-/**
- * enum phy_ch_width - channel width
- * @CH_WIDTH_20MHZ: 20 mhz width
- * @CH_WIDTH_40MHZ: 40 mhz width
- * @CH_WIDTH_80MHZ: 80 mhz width
- * @CH_WIDTH_160MHZ: 160 mhz width
- * @CH_WIDTH_80P80HZ: 80+80 mhz width
- * @CH_WIDTH_5MHZ: 5 mhz width
- * @CH_WIDTH_10MHZ: 10 mhz width
- * @CH_WIDTH_INVALID: invalid width
- * @CH_WIDTH_MAX: max possible width
- */
-enum phy_ch_width {
-	CH_WIDTH_20MHZ = 0,
-	CH_WIDTH_40MHZ,
-	CH_WIDTH_80MHZ,
-	CH_WIDTH_160MHZ,
-	CH_WIDTH_80P80MHZ,
-	CH_WIDTH_5MHZ,
-	CH_WIDTH_10MHZ,
-	CH_WIDTH_INVALID,
-	CH_WIDTH_MAX
-};
-
 /**
  * struct ch_params
  * @ch_width: channel width