datalelements-2: fix enum redefinitions

src/cntlr.h

@@ -18,6 +18,8 @@
 #include <cmdu_ackq.h>
 #include <map_module.h>
 
+#include "wifi_dataelements.h"
+
 extern const char *ubus_socket;
 
 typedef uint32_t object_t;
@@ -88,19 +90,6 @@ struct una_sta_metrics {
 	struct list_head list;
 };
 
-enum steer_trigger {
-	TRIGGER_UNKNOWN,
-	TRIGGER_UTIL,
-	TRIGGER_LINK_QUALITY,
-	TRIGGER_BK_UTIL
-};
-
-enum steer_method {
-	METHOD_ASSOC_CTL,
-	METHOD_BTM_REQ,
-	METHOD_ASYNC_BTM
-};
-
 struct steer_attempt {
 	struct timespec time;
 	uint8_t src_bssid[6];
@@ -367,7 +356,7 @@ struct controller {
 	int num_tx_links;
 	int num_rx_links;
 	struct list_head nodelist;
-	struct list_head stalist;
+	struct list_head stalist; /* list of sta */
 	struct list_head bcnreqlist;
 	struct list_head linklist;
 	struct uloop_timeout radar_timer;

src/config.h

@@ -10,6 +10,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include "wifi_dataelements.h"
+
 /* defined in main.c */
 extern int verbose;
 
@@ -21,36 +23,6 @@ enum cred_diff {
 	CONFIG_DIFF_AGENT_POLICY_CNT = 1 << 4,
 };
 
-enum aptype {
-	AP_WIFI_FBSS,
-	AP_WIFI_BBSS,
-	AP_WIFI_COMBINED,
-};
-
-enum wifi_freqband {
-	BAND_2       = 1 << 0,        /**< 0x1 for 2.4Ghz band. */
-	BAND_5       = 1 << 1,        /**< 0x2 for 5Ghz band. */
-	BAND_DUAL    = 3,             /**< 0x3 for both 2.4 and 5Ghz bands */
-	BAND_60      = 1 << 2,        /**< 0x4 for 60Ghz */
-	BAND_6       = 1 << 3,        /**< 0x8 for 6Ghz */
-	BAND_UNKNOWN = 1 << 4,        /**< 0x10 (and above) for unknown band */
-};
-
-enum wifi_security_type {
-	WIFI_SECURITY_NONE,
-	WIFI_SECURITY_WEP64,
-	WIFI_SECURITY_WEP128,
-	WIFI_SECURITY_WPAPSK,
-	WIFI_SECURITY_WPA2PSK,
-	WIFI_SECURITY_FT_WPA2PSK,
-	WIFI_SECURITY_WPA3PSK,
-	WIFI_SECURITY_WPA3PSK_T,
-	WIFI_SECURITY_FT_WPA3PSK,
-	WIFI_SECURITY_WPA,
-	WIFI_SECURITY_WPA2,
-	WIFI_SECURITY_WPA3,
-};
-
 struct stax {
 	char macstring[32];     /* ':' separated mac address string */
 	struct list_head list;
@@ -69,7 +41,7 @@ struct iface_credential {
 	uint8_t ssid[33];
 	uint16_t vlanid;
 	uint8_t multi_ap;
-	enum aptype mode;
+	enum wifi_bsstype mode;
 	uint8_t disallow_bsta;
 	bool enabled;
 	struct list_head list;

src/wifi_dataelements.h

@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 #ifndef WIFI_H		/* deprecate eventually this section */
-enum wifi_band {
+enum wifi_freqband {
 	BAND_2       = 1 << 0,        /**< 0x1 for 2.4Ghz band. */
 	BAND_5       = 1 << 1,        /**< 0x2 for 5Ghz band. */
 	BAND_DUAL    = 3,             /**< 0x3 for both 2.4 and 5Ghz bands */