From a17539ebcd36896b6a2c7c87b7f1a74c1ef03ab2 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 13 Nov 2011 22:13:04 +0200 Subject: [PATCH] Remove unnecessary include file inclusion Signed-hostap: Jouni Malinen --- src/ap/drv_callbacks.c | 3 --- src/ap/ieee802_1x.c | 1 - src/ap/wpa_auth_ft.c | 1 - src/crypto/crypto_internal-rsa.c | 1 - src/crypto/sha1-pbkdf2.c | 2 -- src/crypto/sha1-tlsprf.c | 1 - src/eap_peer/eap_tnc.c | 1 - src/rsn_supp/preauth.c | 1 - src/rsn_supp/wpa_ft.c | 1 - src/wps/wps_common.c | 1 - src/wps/wps_ufd.c | 1 - wpa_supplicant/ap.c | 3 --- wpa_supplicant/dbus/dbus_new.c | 1 - wpa_supplicant/dbus/dbus_new_handlers.c | 1 - wpa_supplicant/dbus/dbus_old.c | 1 - wpa_supplicant/sme.c | 1 - 16 files changed, 21 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index e4b55af49..142ceb7cd 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -19,7 +19,6 @@ #include "drivers/driver.h" #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" -#include "common/wpa_ctrl.h" #include "crypto/random.h" #include "p2p/p2p.h" #include "wps/wps.h" @@ -28,10 +27,8 @@ #include "sta_info.h" #include "accounting.h" #include "tkip_countermeasures.h" -#include "iapp.h" #include "ieee802_1x.h" #include "wpa_auth.h" -#include "wmm.h" #include "wps_hostapd.h" #include "ap_drv_ops.h" #include "ap_config.h" diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c index f3b23e64b..41d2644e7 100644 --- a/src/ap/ieee802_1x.c +++ b/src/ap/ieee802_1x.c @@ -20,7 +20,6 @@ #include "crypto/crypto.h" #include "crypto/random.h" #include "common/ieee802_11_defs.h" -#include "common/wpa_ctrl.h" #include "radius/radius.h" #include "radius/radius_client.h" #include "eap_server/eap.h" diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c index 4a7d6193a..2d1bbe4bb 100644 --- a/src/ap/wpa_auth_ft.c +++ b/src/ap/wpa_auth_ft.c @@ -24,7 +24,6 @@ #include "wmm.h" #include "wpa_auth.h" #include "wpa_auth_i.h" -#include "wpa_auth_ie.h" #ifdef CONFIG_IEEE80211R diff --git a/src/crypto/crypto_internal-rsa.c b/src/crypto/crypto_internal-rsa.c index 205042cf3..7f0a5cf00 100644 --- a/src/crypto/crypto_internal-rsa.c +++ b/src/crypto/crypto_internal-rsa.c @@ -17,7 +17,6 @@ #include "common.h" #include "crypto.h" #include "tls/rsa.h" -#include "tls/bignum.h" #include "tls/pkcs1.h" #include "tls/pkcs8.h" diff --git a/src/crypto/sha1-pbkdf2.c b/src/crypto/sha1-pbkdf2.c index 11323de7a..9dac977f2 100644 --- a/src/crypto/sha1-pbkdf2.c +++ b/src/crypto/sha1-pbkdf2.c @@ -16,8 +16,6 @@ #include "common.h" #include "sha1.h" -#include "md5.h" -#include "crypto.h" static int pbkdf2_sha1_f(const char *passphrase, const char *ssid, size_t ssid_len, int iterations, unsigned int count, diff --git a/src/crypto/sha1-tlsprf.c b/src/crypto/sha1-tlsprf.c index 2c8c029ec..04f614ced 100644 --- a/src/crypto/sha1-tlsprf.c +++ b/src/crypto/sha1-tlsprf.c @@ -17,7 +17,6 @@ #include "common.h" #include "sha1.h" #include "md5.h" -#include "crypto.h" /** diff --git a/src/eap_peer/eap_tnc.c b/src/eap_peer/eap_tnc.c index 6c95f72c1..da288eb41 100644 --- a/src/eap_peer/eap_tnc.c +++ b/src/eap_peer/eap_tnc.c @@ -15,7 +15,6 @@ #include "includes.h" #include "common.h" -#include "base64.h" #include "eap_i.h" #include "tncc.h" diff --git a/src/rsn_supp/preauth.c b/src/rsn_supp/preauth.c index 6109f5e9f..fefca83ab 100644 --- a/src/rsn_supp/preauth.c +++ b/src/rsn_supp/preauth.c @@ -22,7 +22,6 @@ #include "preauth.h" #include "pmksa_cache.h" #include "wpa_i.h" -#include "common/ieee802_11_defs.h" #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA2) diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c index f6fd7da09..dbf59967b 100644 --- a/src/rsn_supp/wpa_ft.c +++ b/src/rsn_supp/wpa_ft.c @@ -21,7 +21,6 @@ #include "common/ieee802_11_common.h" #include "wpa.h" #include "wpa_i.h" -#include "wpa_ie.h" #ifdef CONFIG_IEEE80211R diff --git a/src/wps/wps_common.c b/src/wps/wps_common.c index 780d5f3c5..a8942e93a 100644 --- a/src/wps/wps_common.c +++ b/src/wps/wps_common.c @@ -22,7 +22,6 @@ #include "crypto/sha256.h" #include "crypto/random.h" #include "wps_i.h" -#include "wps_dev_attr.h" void wps_kdf(const u8 *key, const u8 *label_prefix, size_t label_prefix_len, diff --git a/src/wps/wps_ufd.c b/src/wps/wps_ufd.c index 1a911e1d4..61f65530e 100644 --- a/src/wps/wps_ufd.c +++ b/src/wps/wps_ufd.c @@ -16,7 +16,6 @@ #include "common.h" #include #include -#include #include #include diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index d08fc7c9b..10dd62691 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -30,9 +30,6 @@ #include "ap/ieee802_1x.h" #include "ap/wps_hostapd.h" #include "ap/ctrl_iface_ap.h" -#include "eap_common/eap_defs.h" -#include "eap_server/eap_methods.h" -#include "eap_common/eap_wsc_common.h" #include "wps/wps.h" #include "common/ieee802_11_defs.h" #include "config_ssid.h" diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index a67eadd54..f5f66c80a 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -27,7 +27,6 @@ #include "dbus_dict_helpers.h" #include "dbus_new.h" #include "dbus_new_handlers.h" -#include "dbus_common.h" #include "dbus_common_i.h" #include "dbus_new_handlers_p2p.h" #include "p2p/p2p.h" diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 9b88820c1..e3526d460 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -25,7 +25,6 @@ #include "../wpa_supplicant_i.h" #include "../driver_i.h" #include "../notify.h" -#include "../wpas_glue.h" #include "../bss.h" #include "../scan.h" #include "../ctrl_iface.h" diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c index d255e142b..71ab61e1a 100644 --- a/wpa_supplicant/dbus/dbus_old.c +++ b/wpa_supplicant/dbus/dbus_old.c @@ -23,7 +23,6 @@ #include "../bss.h" #include "dbus_old.h" #include "dbus_old_handlers.h" -#include "dbus_common.h" #include "dbus_common_i.h" diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index da689d2ad..fe8be005b 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -29,7 +29,6 @@ #include "wps_supplicant.h" #include "p2p_supplicant.h" #include "notify.h" -#include "blacklist.h" #include "bss.h" #include "scan.h" #include "sme.h"