Remove src/crypto from default include path
[libeap.git] / hostapd / config.c
index 12c15ba..d4ce227 100644 (file)
 #include <grp.h>
 #endif /* CONFIG_NATIVE_WINDOWS */
 
-#include "hostapd.h"
+#include "common.h"
+#include "crypto/sha1.h"
 #include "drivers/driver.h"
-#include "sha1.h"
-#include "eap_server/eap.h"
 #include "radius/radius_client.h"
-#include "wpa_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_common.h"
+#include "eap_common/eap_wsc_common.h"
+#include "eap_server/eap.h"
+#include "hostapd.h"
 #include "wpa.h"
 #include "uuid.h"
-#include "eap_common/eap_wsc_common.h"
 #include "sta_info.h"
 #include "config.h"
 
@@ -1757,7 +1759,7 @@ struct hostapd_config * hostapd_config_read(const char *fname)
                        bss->radius->retry_primary_interval = atoi(pos);
                } else if (os_strcmp(buf, "radius_acct_interim_interval") == 0)
                {
-                       bss->radius->acct_interim_interval = atoi(pos);
+                       bss->acct_interim_interval = atoi(pos);
 #endif /* CONFIG_NO_RADIUS */
                } else if (os_strcmp(buf, "auth_algs") == 0) {
                        bss->auth_algs = atoi(pos);
@@ -2066,12 +2068,6 @@ struct hostapd_config * hostapd_config_read(const char *fname)
                        bss->ssid.vlan_tagged_interface = os_strdup(pos);
 #endif /* CONFIG_FULL_DYNAMIC_VLAN */
 #endif /* CONFIG_NO_VLAN */
-               } else if (os_strcmp(buf, "passive_scan_interval") == 0) {
-                       conf->passive_scan_interval = atoi(pos);
-               } else if (os_strcmp(buf, "passive_scan_listen") == 0) {
-                       conf->passive_scan_listen = atoi(pos);
-               } else if (os_strcmp(buf, "passive_scan_mode") == 0) {
-                       conf->passive_scan_mode = atoi(pos);
                } else if (os_strcmp(buf, "ap_table_max_size") == 0) {
                        conf->ap_table_max_size = atoi(pos);
                } else if (os_strcmp(buf, "ap_table_expiration_time") == 0) {