Remove unnecessary CONFIG_IEEE80211N use

diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c
index ed635bd22cfd6267fde221894efe6f4f7fb73b1a..f7ceb5f5cb60e22a4878f447e03b6bc9fb62343f 100644 (file)
--- a/hostapd/ap_list.c
+++ b/hostapd/ap_list.c
@@ -56,15 +56,6 @@ static int ap_list_beacon_olbc(struct hostapd_iface *iface, struct ap_info *ap)
 }
 
 
-#ifdef CONFIG_IEEE80211N
-static int ap_list_beacon_olbc_ht(struct hostapd_iface *iface,
-                                 struct ap_info *ap)
-{
-       return !ap->ht_support;
-}
-#endif /* CONFIG_IEEE80211N */
-
-
 struct ap_info * ap_get_ap(struct hostapd_iface *iface, u8 *ap)
 {
        struct ap_info *s;
@@ -323,7 +314,7 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
        }
 
 #ifdef CONFIG_IEEE80211N
-       if (!iface->olbc_ht && ap_list_beacon_olbc_ht(iface, ap)) {
+       if (!iface->olbc_ht && !ap->ht_support) {
                iface->olbc_ht = 1;
                hostapd_ht_operation_update(iface);
                wpa_printf(MSG_DEBUG, "OLBC HT AP detected: " MACSTR
@@ -368,10 +359,8 @@ static void ap_list_timer(void *eloop_ctx, void *timeout_ctx)
                while (ap && (olbc == 0 || olbc_ht == 0)) {
                        if (ap_list_beacon_olbc(iface, ap))
                                olbc = 1;
-#ifdef CONFIG_IEEE80211N
-                       if (ap_list_beacon_olbc_ht(iface, ap))
+                       if (!ap->ht_support)
                                olbc_ht = 1;
-#endif /* CONFIG_IEEE80211N */
                        ap = ap->next;
                }
                if (!olbc && iface->olbc) {

diff --git a/hostapd/ap_list.h b/hostapd/ap_list.h
index 8952fab9a33080742f25191324418a331b33e30d..22181c71bcc9966c9f617d6cf2cfb63f7321c534 100644 (file)
--- a/hostapd/ap_list.h
+++ b/hostapd/ap_list.h
@@ -3,7 +3,6 @@
  * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
  * Copyright (c) 2003-2004, Instant802 Networks, Inc.
  * Copyright (c) 2006, Devicescape Software, Inc.
- * Copyright (c) 2007-2008, Intel Corporation
  *
  * 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

diff --git a/hostapd/config.c b/hostapd/config.c
index d4ce22744b20a819d852cba718de9f51455a8b23..94d3bae8df338b8f0266d5d3d84b2eb4fe56b650 100644 (file)
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -1,7 +1,6 @@
 /*
  * hostapd / Configuration file
- * Copyright (c) 2003-2008, 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
@@ -262,9 +261,7 @@ struct hostapd_config * hostapd_config_defaults(void)
        conf->wmm_ac_params[2] = ac_vi;
        conf->wmm_ac_params[3] = ac_vo;
 
-#ifdef CONFIG_IEEE80211N
        conf->ht_capab = HT_CAP_INFO_SMPS_DISABLED;
-#endif /* CONFIG_IEEE80211N */
 
        return conf;
 }

diff --git a/hostapd/config.h b/hostapd/config.h
index beb6b7a61ea9d30d193d5138025fd657d7fd1c11..ae3da9790eecb8b2141e7481087f4d724b835de9 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
@@ -367,10 +366,8 @@ struct hostapd_config {
                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;
 };

diff --git a/hostapd/driver_i.h b/hostapd/driver_i.h
index c9c044cc879fb27db08ae3c0dbe23acdb68f2eea..f639d253c2c3175967ca780f5b2077af2327eaa7 100644 (file)
--- a/hostapd/driver_i.h
+++ b/hostapd/driver_i.h
@@ -1,7 +1,6 @@
 /*
  * hostapd - internal driver interface wrappers
  * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
- * Copyright (c) 2007-2008, Intel Corporation
  *
  * 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
@@ -472,7 +471,6 @@ hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
        return hapd->driver->set_radius_acl_expire(hapd->drv_priv, mac);
 }
 
-#ifdef CONFIG_IEEE80211N
 static inline int
 hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
                      const u8 *ht_capab, size_t ht_capab_len,
@@ -485,7 +483,6 @@ hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
                ifname, hapd->drv_priv, ht_capab, ht_capab_len,
                ht_oper, ht_oper_len);
 }
-#endif /* CONFIG_IEEE80211N */
 
 static inline int
 hostapd_drv_none(struct hostapd_data *hapd)