Include sta_flags.h explicitly, not via sta_info.h

diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index c6480f32fd8c8a35432fbc6a0b62611511bf0b73..f5eed1ccca6f20022e9a2b3aad08a7ca5d299dba 100644 (file)
--- a/hostapd/drv_callbacks.c
+++ b/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"

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 47941c53e0a97e4c6ae3c0358ddf255cbfc2b355..e3747b075295e0041a09db0ffa86c1a1fdd1ef2b 100644 (file)
--- a/hostapd/hostapd.c
+++ b/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"

diff --git a/hostapd/iapp.c b/hostapd/iapp.c
index 95c354536b7fcfd8ac2c51a478a39dfeee2858d7..9a0b2e7c6686d217f1b03758adacc95812ac1bae 100644 (file)
--- a/hostapd/iapp.c
+++ b/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"
 
 

diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index 9a2a67c7eb3325bdbb9f252fd0b24994ca568307..e7a4cded68f3125ac3a5fc77fade8f4efda4ff0f 100644 (file)
--- a/hostapd/ieee802_11.c
+++ b/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"

diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index 639949f71c144d531cd32160042f19f6dd13543a..68acd37af43dded493ae70c7aedb6943d0149e42 100644 (file)
--- a/hostapd/ieee802_1x.c
+++ b/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"

diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index f9b143ae4d4533b714435224b48716930f2e4223..d394c053e6c812ba2b73cb1fad9a9d91c6384182 100644 (file)
--- a/hostapd/mlme.c
+++ b/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"
 

diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index b26bb1ffa31b76511e3028f53559043ccbd5af87..2b1558ceb6e35675ec77280a8a8ca39cd360ca1a 100644 (file)
--- a/hostapd/preauth.c
+++ b/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"

diff --git a/hostapd/sta_info.c b/hostapd/sta_info.c
index fe319c56b05f5108c5966e5f18fe6c3be0d59d00..606e85dd12d26f4131a60fc74aa1ec49a9a22453 100644 (file)
--- a/hostapd/sta_info.c
+++ b/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"

diff --git a/hostapd/sta_info.h b/hostapd/sta_info.h
index 52e2f2e151efbdb3ecac2eadbd2c5d4b8f3055f5..a12808245f53f34b2eac35ce314f0c83c7aa6e14 100644 (file)
--- a/hostapd/sta_info.h
+++ b/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 */

diff --git a/hostapd/tkip_countermeasures.c b/hostapd/tkip_countermeasures.c
index 37efc8c695d6d82f4d8114bfed78ef8352dfd3e2..3671a293057215d48f8a1e58248964d17ca42e84 100644 (file)
--- a/hostapd/tkip_countermeasures.c
+++ b/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"

diff --git a/hostapd/wme.c b/hostapd/wme.c
index efcbe37142071eb91ad11e74c2dff0de10ce4e75..69b05d7d7d78ec3b45def256d0526a38b58db502 100644 (file)
--- a/hostapd/wme.c
+++ b/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"
 

diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index 1ca0ff9ac131815661e24a35a2e50f8908b2c16f..793457dc888858cb12db3800bd9afa52cf915fd6 100644 (file)
--- a/hostapd/wps_hostapd.c
+++ b/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"

diff --git a/src/drivers/driver_prism54.c b/src/drivers/driver_prism54.c
index c0b038e8e370bf69f64b134814925827dafc3cce..10b8146da42da8e4631ecbf27e5242b028a29d13 100644 (file)
--- a/src/drivers/driver_prism54.c
+++ b/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"