Conver hostapd specific files to include common.h

Instead of getting this via hostapd.h, include it as the first
non-system header file in all source code files in the same way as
used in all other files.

diff --git a/hostapd/accounting.c b/hostapd/accounting.c
index 7fdcf1c06819c49297ba26fcde6aabece495f7b3..991fb5326243d2348404b4d4644977e62cef568d 100644 (file)
--- a/hostapd/accounting.c
+++ b/hostapd/accounting.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"

diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c
index a4eeb373488dc271918f4c7f081e1a16bd8d6c54..7cb7b37422461a278bc581d3d767ec60f2d6f44a 100644 (file)
--- a/hostapd/ap_list.c
+++ b/hostapd/ap_list.c
@@ -17,6 +17,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "config.h"
 #include "ieee802_11.h"

diff --git a/hostapd/beacon.c b/hostapd/beacon.c
index 425b51417263de04b9f8f86104ff56fa5a9906f7..87da483362365f3535b1111a0b4e1c0d5811e378 100644 (file)
--- a/hostapd/beacon.c
+++ b/hostapd/beacon.c
@@ -19,6 +19,7 @@
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
+#include "common.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wpa.h"

diff --git a/hostapd/config.c b/hostapd/config.c
index e0571aa940075b4a13c5f6a1ecbed8c1bab88569..f92bbdebd968647283448ba73a782ad1644b53fc 100644 (file)
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -18,6 +18,7 @@
 #include <grp.h>
 #endif /* CONFIG_NATIVE_WINDOWS */
 
+#include "common.h"
 #include "hostapd.h"
 #include "drivers/driver.h"
 #include "sha1.h"

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index e8bb87232c2bed6525dc9d9465cbf9994b0e395b..e3c88a79e6933d34f0d27c65c448d61a82c172aa 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -20,6 +20,7 @@
 #include <sys/stat.h>
 #include <stddef.h>
 
+#include "common.h"
 #include "hostapd.h"
 #include "eloop.h"
 #include "config.h"

diff --git a/hostapd/ctrl_iface_ap.c b/hostapd/ctrl_iface_ap.c
index b98eb9772dd47e7621d0d0ee5c5fffff9f51a4a6..2465f7028d229380c2820b7a302f83093fa4abb8 100644 (file)
--- a/hostapd/ctrl_iface_ap.c
+++ b/hostapd/ctrl_iface_ap.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "ieee802_1x.h"
 #include "wpa.h"

diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index a7b7571dfffd548cb0f24932f4f3670d81b4ed06..031c290f24fc622402676add01d3e84f56fd9acd 100644 (file)
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "driver_i.h"
 #include "ieee802_11.h"

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index e3747b075295e0041a09db0ffa86c1a1fdd1ef2b..ed7c054839decbcd721ba2a7792dd7cf7037bea0 100644 (file)
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "eloop.h"
 #include "hostapd.h"
 #include "ieee802_1x.h"

diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index c2aa8df47321ee0a18e5352a4b103d6243886d5b..8835e7ae435a3ed1f07c0011f9501b70854be905 100644 (file)
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -17,8 +17,6 @@
 #ifndef HOSTAPD_H
 #define HOSTAPD_H
 
-#include "common.h"
-
 #define MAX_VLAN_ID 4094
 
 struct wpa_driver_ops;

diff --git a/hostapd/hw_features.c b/hostapd/hw_features.c
index e6caf506fbcf96ddfa1ef00510e8f998260b548a..fd1514e1db57cbd42daa27d7c82cd8a9dde66a60 100644 (file)
--- a/hostapd/hw_features.c
+++ b/hostapd/hw_features.c
@@ -16,6 +16,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"

diff --git a/hostapd/iapp.c b/hostapd/iapp.c
index 9a0b2e7c6686d217f1b03758adacc95812ac1bae..1451aa4d77dc7ff6fce098c10b65f8d632208763 100644 (file)
--- a/hostapd/iapp.c
+++ b/hostapd/iapp.c
@@ -46,6 +46,7 @@
 #include <netpacket/packet.h>
 #endif /* USE_KERNEL_HEADERS */
 
+#include "common.h"
 #include "hostapd.h"
 #include "config.h"
 #include "ieee802_11.h"

diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index e7a4cded68f3125ac3a5fc77fade8f4efda4ff0f..87775c37cb3fd924b385954224e60f931d0aaf2f 100644 (file)
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -19,6 +19,7 @@
 
 #include <net/if.h>
 
+#include "common.h"
 #include "eloop.h"
 #include "hostapd.h"
 #include "ieee802_11.h"

diff --git a/hostapd/ieee802_11_auth.c b/hostapd/ieee802_11_auth.c
index b20404991143a2e78256c762e98f6a1da9b7dacb..0aa86b08a3bc81ea1a074d56e8ef902a8e20ff4f 100644 (file)
--- a/hostapd/ieee802_11_auth.c
+++ b/hostapd/ieee802_11_auth.c
@@ -21,6 +21,7 @@
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
+#include "common.h"
 #include "hostapd.h"
 #include "config.h"
 #include "ieee802_11.h"

diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index 68acd37af43dded493ae70c7aedb6943d0149e42..985e9bff4fd3bf9d9efb3f67d6ed9dc2eded1d44 100644 (file)
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "ieee802_1x.h"
 #include "accounting.h"

diff --git a/hostapd/main.c b/hostapd/main.c
index e7fddf444fc74fe49cd5331eeb117e9c609762fa..4f403563d1cf9966b4d04b81c6aaa1a1f544b300 100644 (file)
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -17,8 +17,9 @@
 #include <syslog.h>
 #endif /* CONFIG_NATIVE_WINDOWS */
 
-#include "eloop.h"
+#include "common.h"
 #include "hostapd.h"
+#include "eloop.h"
 #include "common/version.h"
 #include "config.h"
 #include "tls.h"

diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index d394c053e6c812ba2b73cb1fad9a9d91c6384182..127df37ac0447933c107f86f7db7cb6b3601b6d2 100644 (file)
--- a/hostapd/mlme.c
+++ b/hostapd/mlme.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-#include "hostapd.h"
+#include "common.h"
 #include "ieee802_11.h"
 #include "wpa.h"
 #include "sta_flags.h"

diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index 2b1558ceb6e35675ec77280a8a8ca39cd360ca1a..3914d5ad4e5ed25753cd16348734d1e4b9b1cae4 100644 (file)
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -16,6 +16,7 @@
 
 #ifdef CONFIG_RSN_PREAUTH
 
+#include "common.h"
 #include "hostapd.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"

diff --git a/hostapd/sta_info.c b/hostapd/sta_info.c
index 606e85dd12d26f4131a60fc74aa1ec49a9a22453..ee8187715fa5a38f0f7a22b294f511e7d3909857 100644 (file)
--- a/hostapd/sta_info.c
+++ b/hostapd/sta_info.c
@@ -15,6 +15,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "sta_flags.h"
 #include "sta_info.h"

diff --git a/hostapd/tkip_countermeasures.c b/hostapd/tkip_countermeasures.c
index 3671a293057215d48f8a1e58248964d17ca42e84..53747a466ed5d330d0a6ee044575a2b418ecb777 100644 (file)
--- a/hostapd/tkip_countermeasures.c
+++ b/hostapd/tkip_countermeasures.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "eloop.h"
 #include "driver_i.h"

diff --git a/hostapd/vlan_init.c b/hostapd/vlan_init.c
index 05aa7dd245dea07ff97bd860e3cda5e70fe52d26..6de54ea2adab0fcb896eaf2b29d31193bf0d4ade 100644 (file)
--- a/hostapd/vlan_init.c
+++ b/hostapd/vlan_init.c
@@ -15,6 +15,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "driver_i.h"
 #include "vlan_init.h"

diff --git a/hostapd/wme.c b/hostapd/wme.c
index 69b05d7d7d78ec3b45def256d0526a38b58db502..87e2d406d8bf631019f1ad5d537772d3f53c21ba 100644 (file)
--- a/hostapd/wme.c
+++ b/hostapd/wme.c
@@ -15,6 +15,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wme.h"

diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index 793457dc888858cb12db3800bd9afa52cf915fd6..e8704fbfc35e5922cb88884add1d8201f9c48289 100644 (file)
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include "common.h"
 #include "hostapd.h"
 #include "driver_i.h"
 #include "eloop.h"