Include sta_flags.h explicitly, not via sta_info.h

hostapd/drv_callbacks.c

@@ -18,6 +18,7 @@
 #include "driver_i.h"
 #include "ieee802_11.h"
 #include "radius/radius.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "accounting.h"
 #include "tkip_countermeasures.h"

hostapd/hostapd.c

@@ -24,6 +24,7 @@
 #include "iapp.h"
 #include "common/ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "ap_list.h"
 #include "driver_i.h"

hostapd/iapp.c

@@ -51,6 +51,7 @@
 #include "ieee802_11.h"
 #include "iapp.h"
 #include "eloop.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 
 

hostapd/ieee802_11.c

@@ -27,6 +27,7 @@
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "ieee802_11_auth.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "crypto.h"
 #include "ieee802_1x.h"

hostapd/ieee802_1x.c

@@ -23,6 +23,7 @@
 #include "md5.h"
 #include "crypto.h"
 #include "eloop.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "wpa.h"
 #include "preauth.h"

hostapd/mlme.c

@@ -19,6 +19,7 @@
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wpa.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "mlme.h"
 

hostapd/preauth.c

@@ -21,6 +21,7 @@
 #include "l2_packet/l2_packet.h"
 #include "ieee802_1x.h"
 #include "eloop.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "common/wpa_common.h"
 #include "eapol_sm.h"

hostapd/sta_info.c

@@ -16,6 +16,7 @@
 #include "includes.h"
 
 #include "hostapd.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "eloop.h"
 #include "accounting.h"

hostapd/sta_info.h

@@ -15,8 +15,6 @@
 #ifndef STA_INFO_H
 #define STA_INFO_H
 
-#include "sta_flags.h"
-
 #ifdef CONFIG_IEEE80211N
 #include "common/ieee802_11_defs.h"
 #endif /* CONFIG_IEEE80211N */

hostapd/tkip_countermeasures.c

@@ -17,6 +17,7 @@
 #include "hostapd.h"
 #include "eloop.h"
 #include "driver_i.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "mlme.h"
 #include "wpa.h"

hostapd/wme.c

@@ -18,6 +18,7 @@
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wme.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "driver_i.h"
 

hostapd/wps_hostapd.c

@@ -21,6 +21,7 @@
 #include "common/wpa_ctrl.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "eapol_sm.h"
 #include "wps/wps.h"

src/drivers/driver_prism54.c

@@ -37,6 +37,7 @@
 #include "../../hostapd/ieee802_1x.h"
 #include "../../hostapd/ieee802_11.h"
 #include "../../hostapd/wpa.h"
+#include "../../hostapd/sta_flags.h"
 #include "../../hostapd/sta_info.h"
 #include "../../hostapd/accounting.h"