Remove unnecessary CONFIG_IEEE80211N use

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) {

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

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;
 }

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;
 };

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)