Describe tracing build options for developers

[libeap.git] / hostapd / ap_list.c

diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c
index ed635bd..ec6c2c0 100644 (file)
--- a/hostapd/ap_list.c
+++ b/hostapd/ap_list.c
@@ -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
@@ -56,16 +55,7 @@ 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 * ap_get_ap(struct hostapd_iface *iface, const u8 *ap)
 {
        struct ap_info *s;
 
@@ -205,7 +195,7 @@ int ap_ap_for_each(struct hostapd_iface *iface,
 }
 
 
-static struct ap_info * ap_ap_add(struct hostapd_iface *iface, u8 *addr)
+static struct ap_info * ap_ap_add(struct hostapd_iface *iface, const u8 *addr)
 {
        struct ap_info *ap;
 
@@ -231,7 +221,7 @@ static struct ap_info * ap_ap_add(struct hostapd_iface *iface, u8 *addr)
 
 
 void ap_list_process_beacon(struct hostapd_iface *iface,
-                           struct ieee80211_mgmt *mgmt,
+                           const struct ieee80211_mgmt *mgmt,
                            struct ieee802_11_elems *elems,
                            struct hostapd_frame_info *fi)
 {
@@ -323,7 +313,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 +358,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) {