From 13daed58c7bd63b073634d1ea73b3b75fa87d5d2 Mon Sep 17 00:00:00 2001 From: Andrei Otcheretianski Date: Sun, 15 Dec 2013 10:47:40 +0200 Subject: [PATCH] Include driver.h in hostapd.h This allows use of structs (and not only pointers) defined in drivers.h. Remove also some not needed forward declarations and redundant includes. Signed-hostap: Andrei Otcheretianski --- src/ap/accounting.c | 1 - src/ap/ap_drv_ops.c | 1 - src/ap/ap_list.c | 1 - src/ap/beacon.c | 1 - src/ap/hostapd.c | 1 - src/ap/hostapd.h | 5 +---- src/ap/hw_features.c | 1 - src/ap/ieee802_11.c | 1 - src/ap/ieee802_11_ht.c | 1 - src/ap/ieee802_11_vht.c | 1 - src/ap/sta_info.c | 1 - src/ap/wpa_auth_glue.c | 1 - 12 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/ap/accounting.c b/src/ap/accounting.c index 96bfce33a..6290d3f39 100644 --- a/src/ap/accounting.c +++ b/src/ap/accounting.c @@ -10,7 +10,6 @@ #include "utils/common.h" #include "utils/eloop.h" -#include "drivers/driver.h" #include "radius/radius.h" #include "radius/radius_client.h" #include "hostapd.h" diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c index 09b5f68b1..bd5d8b2f6 100644 --- a/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c @@ -9,7 +9,6 @@ #include "utils/includes.h" #include "utils/common.h" -#include "drivers/driver.h" #include "common/ieee802_11_defs.h" #include "wps/wps.h" #include "p2p/p2p.h" diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c index 0dab39fa0..f9b154012 100644 --- a/src/ap/ap_list.c +++ b/src/ap/ap_list.c @@ -14,7 +14,6 @@ #include "utils/eloop.h" #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" -#include "drivers/driver.h" #include "hostapd.h" #include "ap_config.h" #include "ieee802_11.h" diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 0e0dae467..cdee579a4 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -21,7 +21,6 @@ #include "utils/common.h" #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" -#include "drivers/driver.h" #include "wps/wps_defs.h" #include "p2p/p2p.h" #include "hostapd.h" diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index a436c2aec..4c5937203 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -14,7 +14,6 @@ #include "common/wpa_ctrl.h" #include "radius/radius_client.h" #include "radius/radius_das.h" -#include "drivers/driver.h" #include "hostapd.h" #include "authsrv.h" #include "sta_info.h" diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h index 6f786a8f6..88b56e39c 100644 --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -11,14 +11,13 @@ #include "common/defs.h" #include "ap_config.h" +#include "drivers/driver.h" -struct wpa_driver_ops; struct wpa_ctrl_dst; struct radius_server_data; struct upnp_wps_device_sm; struct hostapd_data; struct sta_info; -struct hostap_sta_driver_data; struct ieee80211_ht_capabilities; struct full_dynamic_vlan; enum wps_event; @@ -27,8 +26,6 @@ union wps_event_data; struct hostapd_iface; struct hostapd_dynamic_iface; -struct csa_settings; - struct hapd_interfaces { int (*reload_config)(struct hostapd_iface *iface); struct hostapd_config * (*config_read_cb)(const char *config_fname); diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c index e95e0e1af..735ba432a 100644 --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -21,7 +21,6 @@ #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" #include "common/wpa_ctrl.h" -#include "drivers/driver.h" #include "hostapd.h" #include "ap_config.h" #include "ap_drv_ops.h" diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index e55f843c6..6f013fb18 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -15,7 +15,6 @@ #include "crypto/crypto.h" #include "crypto/sha256.h" #include "crypto/random.h" -#include "drivers/driver.h" #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" #include "common/wpa_ctrl.h" diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c index 2d53648c6..854cbab59 100644 --- a/src/ap/ieee802_11_ht.c +++ b/src/ap/ieee802_11_ht.c @@ -17,7 +17,6 @@ #include "utils/common.h" #include "common/ieee802_11_defs.h" -#include "drivers/driver.h" #include "hostapd.h" #include "ap_config.h" #include "sta_info.h" diff --git a/src/ap/ieee802_11_vht.c b/src/ap/ieee802_11_vht.c index 60e6b5724..f2ab182db 100644 --- a/src/ap/ieee802_11_vht.c +++ b/src/ap/ieee802_11_vht.c @@ -12,7 +12,6 @@ #include "utils/common.h" #include "common/ieee802_11_defs.h" -#include "drivers/driver.h" #include "hostapd.h" #include "ap_config.h" #include "sta_info.h" diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c index d1d865719..c4a0a8697 100644 --- a/src/ap/sta_info.c +++ b/src/ap/sta_info.c @@ -15,7 +15,6 @@ #include "common/sae.h" #include "radius/radius.h" #include "radius/radius_client.h" -#include "drivers/driver.h" #include "p2p/p2p.h" #include "hostapd.h" #include "accounting.h" diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c index cbaab9f09..4c1d62576 100644 --- a/src/ap/wpa_auth_glue.c +++ b/src/ap/wpa_auth_glue.c @@ -15,7 +15,6 @@ #include "eapol_auth/eapol_auth_sm_i.h" #include "eap_server/eap.h" #include "l2_packet/l2_packet.h" -#include "drivers/driver.h" #include "hostapd.h" #include "ieee802_1x.h" #include "preauth_auth.h"