WPS: Add option for forcing Registrar to use PSK format in Credential

[libeap.git] / hostapd / config.h

diff --git a/hostapd/config.h b/hostapd/config.h
index 6d41740..5202645 100644 (file)
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -1,7 +1,6 @@
 /*
  * hostapd / Configuration file
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
- * Copyright (c) 2007-2008, Intel Corporation
+ * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,13 +15,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "ip_addr.h"
-#include "wpa_common.h"
-
-#ifndef IFNAMSIZ
-#define IFNAMSIZ 16
-#endif
+#include "common/wpa_common.h"
 
 typedef u8 macaddr[ETH_ALEN];
 
@@ -171,6 +166,7 @@ struct hostapd_bss_config {
        struct hostapd_ip_addr own_ip_addr;
        char *nas_identifier;
        struct hostapd_radius_servers *radius;
+       int acct_interim_interval;
 
        struct hostapd_ssid ssid;
 
@@ -339,11 +335,8 @@ struct hostapd_config {
        int *supported_rates;
        int *basic_rates;
 
-       const struct hapd_driver_ops *driver;
+       const struct wpa_driver_ops *driver;
 
-       int passive_scan_interval; /* seconds, 0 = disabled */
-       int passive_scan_listen; /* usec */
-       int passive_scan_mode;
        int ap_table_max_size;
        int ap_table_expiration_time;
 
@@ -367,16 +360,8 @@ struct hostapd_config {
         */
        struct hostapd_wmm_ac_params wmm_ac_params[4];
 
-       enum {
-               INTERNAL_BRIDGE_DO_NOT_CONTROL = -1,
-               INTERNAL_BRIDGE_DISABLED = 0,
-               INTERNAL_BRIDGE_ENABLED = 1
-       } bridge_packets;
-
-#ifdef CONFIG_IEEE80211N
        int ht_op_mode_fixed;
        u16 ht_capab;
-#endif /* CONFIG_IEEE80211N */
        int ieee80211n;
        int secondary_channel;
 };