Move IEEE 802.11n HT management code into a separate file
authorJouni Malinen <j@w1.fi>
Sun, 6 Dec 2009 17:41:47 +0000 (19:41 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 6 Dec 2009 17:41:47 +0000 (19:41 +0200)
hostapd/Makefile
hostapd/ap_list.c
hostapd/beacon.c
hostapd/hostapd.h
hostapd/ieee802_11.c
hostapd/ieee802_11.h
hostapd/ieee802_11_ht.c [new file with mode: 0644]
hostapd/sta_info.c

index a607be2..00d58e8 100644 (file)
@@ -668,6 +668,9 @@ endif
 ifdef NEED_AP_MLME
 OBJS += beacon.o wme.o ap_list.o ieee802_11.o
 OBJS += hw_features.o
+ifdef CONFIG_IEEE80211N
+OBJS += ieee802_11_ht.o
+endif
 CFLAGS += -DNEED_AP_MLME
 endif
 
index f7ceb5f..1cdf0a2 100644 (file)
@@ -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
index 87da483..420433e 100644 (file)
@@ -3,7 +3,6 @@
  * Copyright (c) 2002-2004, Instant802 Networks, Inc.
  * Copyright (c) 2005-2006, Devicescape Software, Inc.
  * Copyright (c) 2008-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
@@ -302,8 +301,10 @@ void handle_probe_req(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
        /* Wi-Fi Alliance WMM */
        pos = hostapd_eid_wmm(hapd, pos);
 
+#ifdef CONFIG_IEEE80211N
        pos = hostapd_eid_ht_capabilities(hapd, pos);
        pos = hostapd_eid_ht_operation(hapd, pos);
+#endif /* CONFIG_IEEE80211N */
 
 #ifdef CONFIG_WPS
        if (hapd->conf->wps_state && hapd->wps_probe_resp_ie) {
index dae3c12..3c378b7 100644 (file)
@@ -1,8 +1,6 @@
 /*
  * hostapd / Initialization and configuration
- * Host AP kernel driver
  * Copyright (c) 2002-2008, 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
index f9d519e..3445fff 100644 (file)
@@ -1,7 +1,6 @@
 /*
  * hostapd / IEEE 802.11 Management
  * 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
@@ -103,153 +102,6 @@ u8 * hostapd_eid_ext_supp_rates(struct hostapd_data *hapd, u8 *eid)
 }
 
 
-u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid)
-{
-#ifdef CONFIG_IEEE80211N
-       struct ieee80211_ht_capabilities *cap;
-       u8 *pos = eid;
-
-       if (!hapd->iconf->ieee80211n)
-               return eid;
-
-       *pos++ = WLAN_EID_HT_CAP;
-       *pos++ = sizeof(*cap);
-
-       cap = (struct ieee80211_ht_capabilities *) pos;
-       os_memset(cap, 0, sizeof(*cap));
-       cap->ht_capabilities_info = host_to_le16(hapd->iconf->ht_capab);
-       cap->a_mpdu_params = hapd->iface->current_mode->a_mpdu_params;
-       os_memcpy(cap->supported_mcs_set, hapd->iface->current_mode->mcs_set,
-                 16);
-
-       /* TODO: ht_extended_capabilities (now fully disabled) */
-       /* TODO: tx_bf_capability_info (now fully disabled) */
-       /* TODO: asel_capabilities (now fully disabled) */
-
-       pos += sizeof(*cap);
-
-       return pos;
-#else /* CONFIG_IEEE80211N */
-       return eid;
-#endif /* CONFIG_IEEE80211N */
-}
-
-
-u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
-{
-#ifdef CONFIG_IEEE80211N
-       struct ieee80211_ht_operation *oper;
-       u8 *pos = eid;
-
-       if (!hapd->iconf->ieee80211n)
-               return eid;
-
-       *pos++ = WLAN_EID_HT_OPERATION;
-       *pos++ = sizeof(*oper);
-
-       oper = (struct ieee80211_ht_operation *) pos;
-       os_memset(oper, 0, sizeof(*oper));
-
-       oper->control_chan = hapd->iconf->channel;
-       oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode);
-       if (hapd->iconf->secondary_channel == 1)
-               oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE |
-                       HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH;
-       if (hapd->iconf->secondary_channel == -1)
-               oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW |
-                       HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH;
-
-       pos += sizeof(*oper);
-
-       return pos;
-#else /* CONFIG_IEEE80211N */
-       return eid;
-#endif /* CONFIG_IEEE80211N */
-}
-
-
-#ifdef CONFIG_IEEE80211N
-
-/*
-op_mode
-Set to 0 (HT pure) under the followign conditions
-       - all STAs in the BSS are 20/40 MHz HT in 20/40 MHz BSS or
-       - all STAs in the BSS are 20 MHz HT in 20 MHz BSS
-Set to 1 (HT non-member protection) if there may be non-HT STAs
-       in both the primary and the secondary channel
-Set to 2 if only HT STAs are associated in BSS,
-       however and at least one 20 MHz HT STA is associated
-Set to 3 (HT mixed mode) when one or more non-HT STAs are associated
-       (currently non-GF HT station is considered as non-HT STA also)
-*/
-int hostapd_ht_operation_update(struct hostapd_iface *iface)
-{
-       u16 cur_op_mode, new_op_mode;
-       int op_mode_changes = 0;
-
-       if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
-               return 0;
-
-       wpa_printf(MSG_DEBUG, "%s current operation mode=0x%X",
-                  __func__, iface->ht_op_mode);
-
-       if (!(iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
-           && iface->num_sta_ht_no_gf) {
-               iface->ht_op_mode |=
-                       HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT;
-               op_mode_changes++;
-       } else if ((iface->ht_op_mode &
-                   HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) &&
-                  iface->num_sta_ht_no_gf == 0) {
-               iface->ht_op_mode &=
-                       ~HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT;
-               op_mode_changes++;
-       }
-
-       if (!(iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) &&
-           (iface->num_sta_no_ht || iface->olbc_ht)) {
-               iface->ht_op_mode |= HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT;
-               op_mode_changes++;
-       } else if ((iface->ht_op_mode &
-                   HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) &&
-                  (iface->num_sta_no_ht == 0 && !iface->olbc_ht)) {
-               iface->ht_op_mode &=
-                       ~HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT;
-               op_mode_changes++;
-       }
-
-       /* Note: currently we switch to the MIXED op mode if HT non-greenfield
-        * station is associated. Probably it's a theoretical case, since
-        * it looks like all known HT STAs support greenfield.
-        */
-       new_op_mode = 0;
-       if (iface->num_sta_no_ht ||
-           (iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT))
-               new_op_mode = OP_MODE_MIXED;
-       else if ((iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)
-                && iface->num_sta_ht_20mhz)
-               new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;
-       else if (iface->olbc_ht)
-               new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;
-       else
-               new_op_mode = OP_MODE_PURE;
-
-       cur_op_mode = iface->ht_op_mode & HT_INFO_OPERATION_MODE_OP_MODE_MASK;
-       if (cur_op_mode != new_op_mode) {
-               iface->ht_op_mode &= ~HT_INFO_OPERATION_MODE_OP_MODE_MASK;
-               iface->ht_op_mode |= new_op_mode;
-               op_mode_changes++;
-       }
-
-       wpa_printf(MSG_DEBUG, "%s new operation mode=0x%X changes=%d",
-                  __func__, iface->ht_op_mode, op_mode_changes);
-
-       return op_mode_changes;
-}
-
-#endif /* CONFIG_IEEE80211N */
-
-
 u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
                           int probe)
 {
@@ -783,106 +635,6 @@ static u16 copy_supp_rates(struct hostapd_data *hapd, struct sta_info *sta,
 }
 
 
-#ifdef CONFIG_IEEE80211N
-
-static u16 copy_sta_ht_capab(struct sta_info *sta, const u8 *ht_capab,
-                            size_t ht_capab_len)
-{
-       if (!ht_capab ||
-           ht_capab_len < sizeof(struct ieee80211_ht_capabilities)) {
-               sta->flags &= ~WLAN_STA_HT;
-               os_free(sta->ht_capabilities);
-               sta->ht_capabilities = NULL;
-               return WLAN_STATUS_SUCCESS;
-       }
-
-       if (sta->ht_capabilities == NULL) {
-               sta->ht_capabilities =
-                       os_zalloc(sizeof(struct ieee80211_ht_capabilities));
-               if (sta->ht_capabilities == NULL)
-                       return WLAN_STATUS_UNSPECIFIED_FAILURE;
-       }
-
-       sta->flags |= WLAN_STA_HT;
-       os_memcpy(sta->ht_capabilities, ht_capab,
-                 sizeof(struct ieee80211_ht_capabilities));
-
-       return WLAN_STATUS_SUCCESS;
-}
-
-
-static void update_sta_ht(struct hostapd_data *hapd, struct sta_info *sta)
-{
-       u16 ht_capab;
-
-       ht_capab = le_to_host16(sta->ht_capabilities->ht_capabilities_info);
-       wpa_printf(MSG_DEBUG, "HT: STA " MACSTR " HT Capabilities Info: "
-                  "0x%04x", MAC2STR(sta->addr), ht_capab);
-       if ((ht_capab & HT_CAP_INFO_GREEN_FIELD) == 0) {
-               if (!sta->no_ht_gf_set) {
-                       sta->no_ht_gf_set = 1;
-                       hapd->iface->num_sta_ht_no_gf++;
-               }
-               wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - no greenfield, num "
-                          "of non-gf stations %d",
-                          __func__, MAC2STR(sta->addr),
-                          hapd->iface->num_sta_ht_no_gf);
-       }
-       if ((ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET) == 0) {
-               if (!sta->ht_20mhz_set) {
-                       sta->ht_20mhz_set = 1;
-                       hapd->iface->num_sta_ht_20mhz++;
-               }
-               wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - 20 MHz HT, num of "
-                          "20MHz HT STAs %d",
-                          __func__, MAC2STR(sta->addr),
-                          hapd->iface->num_sta_ht_20mhz);
-       }
-}
-
-
-static void update_sta_no_ht(struct hostapd_data *hapd, struct sta_info *sta)
-{
-       if (!sta->no_ht_set) {
-               sta->no_ht_set = 1;
-               hapd->iface->num_sta_no_ht++;
-       }
-       if (hapd->iconf->ieee80211n) {
-               wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - no HT, num of "
-                          "non-HT stations %d",
-                          __func__, MAC2STR(sta->addr),
-                          hapd->iface->num_sta_no_ht);
-       }
-}
-
-
-static void update_ht_state(struct hostapd_data *hapd, struct sta_info *sta)
-{
-       if ((sta->flags & WLAN_STA_HT) && sta->ht_capabilities)
-               update_sta_ht(hapd, sta);
-       else
-               update_sta_no_ht(hapd, sta);
-
-       if (hostapd_ht_operation_update(hapd->iface) > 0)
-               ieee802_11_set_beacons(hapd->iface);
-}
-
-#else /* CONFIG_IEEE80211N */
-
-static u16 copy_sta_ht_capab(struct sta_info *sta, const u8 *ht_capab,
-                            size_t ht_capab_len)
-{
-       return WLAN_STATUS_SUCCESS;
-}
-
-
-static void update_ht_state(struct hostapd_data *hapd, struct sta_info *sta)
-{
-}
-
-#endif /* CONFIG_IEEE80211N */
-
-
 static u16 check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta,
                           u8 *ies, size_t ies_len, int reassoc)
 {
@@ -907,10 +659,12 @@ static u16 check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta,
        resp = copy_supp_rates(hapd, sta, &elems);
        if (resp != WLAN_STATUS_SUCCESS)
                return resp;
+#ifdef CONFIG_IEEE80211N
        resp = copy_sta_ht_capab(sta, elems.ht_capabilities,
                                 elems.ht_capabilities_len);
        if (resp != WLAN_STATUS_SUCCESS)
                return resp;
+#endif /* CONFIG_IEEE80211N */
 
        if ((hapd->conf->wpa & WPA_PROTO_RSN) && elems.rsn_ie) {
                wpa_ie = elems.rsn_ie;
@@ -1100,8 +854,10 @@ static void send_assoc_resp(struct hostapd_data *hapd, struct sta_info *sta,
        if (sta->flags & WLAN_STA_WMM)
                p = hostapd_eid_wmm(hapd, p);
 
+#ifdef CONFIG_IEEE80211N
        p = hostapd_eid_ht_capabilities(hapd, p);
        p = hostapd_eid_ht_operation(hapd, p);
+#endif /* CONFIG_IEEE80211N */
 
 #ifdef CONFIG_IEEE80211R
        if (status_code == WLAN_STATUS_SUCCESS) {
@@ -1254,7 +1010,9 @@ static void handle_assoc(struct hostapd_data *hapd,
                        ieee802_11_set_beacons(hapd->iface);
        }
 
+#ifdef CONFIG_IEEE80211N
        update_ht_state(hapd, sta);
+#endif /* CONFIG_IEEE80211N */
 
        hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
                       HOSTAPD_LEVEL_DEBUG,
@@ -1700,28 +1458,6 @@ static void handle_auth_cb(struct hostapd_data *hapd,
 }
 
 
-#ifdef CONFIG_IEEE80211N
-static void
-hostapd_get_ht_capab(struct hostapd_data *hapd,
-                    struct ieee80211_ht_capabilities *ht_cap,
-                    struct ieee80211_ht_capabilities *neg_ht_cap)
-{
-       u16 cap;
-
-       if (ht_cap == NULL)
-               return;
-       os_memcpy(neg_ht_cap, ht_cap, sizeof(*neg_ht_cap));
-       cap = le_to_host16(neg_ht_cap->ht_capabilities_info);
-       cap &= hapd->iconf->ht_capab;
-       cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED);
-
-       /* FIXME: Rx STBC needs to be handled specially */
-       cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_RX_STBC_MASK);
-       neg_ht_cap->ht_capabilities_info = host_to_le16(cap);
-}
-#endif /* CONFIG_IEEE80211N */
-
-
 static void handle_assoc_cb(struct hostapd_data *hapd,
                            struct ieee80211_mgmt *mgmt,
                            size_t len, int reassoc, int ok)
@@ -1729,10 +1465,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
        u16 status;
        struct sta_info *sta;
        int new_assoc = 1;
-#ifdef CONFIG_IEEE80211N
        struct ieee80211_ht_capabilities ht_cap;
-#endif /* CONFIG_IEEE80211N */
-       struct ieee80211_ht_capabilities *ht_cap_ptr = NULL;
        int set_flags, flags_and, flags_or;
 
        if (!ok) {
@@ -1788,13 +1521,6 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
        else
                mlme_associate_indication(hapd, sta);
 
-#ifdef CONFIG_IEEE80211N
-       if (sta->flags & WLAN_STA_HT) {
-               ht_cap_ptr = &ht_cap;
-               hostapd_get_ht_capab(hapd, sta->ht_capabilities, ht_cap_ptr);
-       }
-#endif /* CONFIG_IEEE80211N */
-
 #ifdef CONFIG_IEEE80211W
        sta->sa_query_timed_out = 0;
 #endif /* CONFIG_IEEE80211W */
@@ -1806,10 +1532,15 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
         */
        hostapd_sta_remove(hapd, sta->addr);
 
+#ifdef CONFIG_IEEE80211N
+       if (sta->flags & WLAN_STA_HT)
+               hostapd_get_ht_capab(hapd, sta->ht_capabilities, &ht_cap);
+#endif /* CONFIG_IEEE80211N */
+
        if (hostapd_sta_add(hapd->conf->iface, hapd, sta->addr, sta->aid,
                            sta->capability, sta->supported_rates,
                            sta->supported_rates_len, 0, sta->listen_interval,
-                           ht_cap_ptr))
+                           sta->flags & WLAN_STA_HT ? &ht_cap : NULL))
        {
                hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
                               HOSTAPD_LEVEL_NOTICE,
index 9bcb309..ed810d3 100644 (file)
@@ -1,7 +1,6 @@
 /*
  * hostapd / IEEE 802.11 Management
- * Copyright (c) 2002-2006, Jouni Malinen <j@w1.fi>
- * Copyright (c) 2007-2008, Intel Corporation
+ * Copyright (c) 2002-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
@@ -57,5 +56,11 @@ u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid);
 int hostapd_ht_operation_update(struct hostapd_iface *iface);
 void ieee802_11_send_sa_query_req(struct hostapd_data *hapd,
                                  const u8 *addr, const u8 *trans_id);
+void hostapd_get_ht_capab(struct hostapd_data *hapd,
+                         struct ieee80211_ht_capabilities *ht_cap,
+                         struct ieee80211_ht_capabilities *neg_ht_cap);
+u16 copy_sta_ht_capab(struct sta_info *sta, const u8 *ht_capab,
+                     size_t ht_capab_len);
+void update_ht_state(struct hostapd_data *hapd, struct sta_info *sta);
 
 #endif /* IEEE802_11_H */
diff --git a/hostapd/ieee802_11_ht.c b/hostapd/ieee802_11_ht.c
new file mode 100644 (file)
index 0000000..817e1e7
--- /dev/null
@@ -0,0 +1,262 @@
+/*
+ * hostapd / IEEE 802.11n HT
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+
+#include "includes.h"
+
+#include "common.h"
+#include "drivers/driver.h"
+#include "hostapd.h"
+#include "config.h"
+#include "sta_flags.h"
+#include "sta_info.h"
+#include "beacon.h"
+#include "ieee802_11.h"
+
+
+u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid)
+{
+       struct ieee80211_ht_capabilities *cap;
+       u8 *pos = eid;
+
+       if (!hapd->iconf->ieee80211n)
+               return eid;
+
+       *pos++ = WLAN_EID_HT_CAP;
+       *pos++ = sizeof(*cap);
+
+       cap = (struct ieee80211_ht_capabilities *) pos;
+       os_memset(cap, 0, sizeof(*cap));
+       cap->ht_capabilities_info = host_to_le16(hapd->iconf->ht_capab);
+       cap->a_mpdu_params = hapd->iface->current_mode->a_mpdu_params;
+       os_memcpy(cap->supported_mcs_set, hapd->iface->current_mode->mcs_set,
+                 16);
+
+       /* TODO: ht_extended_capabilities (now fully disabled) */
+       /* TODO: tx_bf_capability_info (now fully disabled) */
+       /* TODO: asel_capabilities (now fully disabled) */
+
+       pos += sizeof(*cap);
+
+       return pos;
+}
+
+
+u8 * hostapd_eid_ht_operation(struct hostapd_data *hapd, u8 *eid)
+{
+       struct ieee80211_ht_operation *oper;
+       u8 *pos = eid;
+
+       if (!hapd->iconf->ieee80211n)
+               return eid;
+
+       *pos++ = WLAN_EID_HT_OPERATION;
+       *pos++ = sizeof(*oper);
+
+       oper = (struct ieee80211_ht_operation *) pos;
+       os_memset(oper, 0, sizeof(*oper));
+
+       oper->control_chan = hapd->iconf->channel;
+       oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode);
+       if (hapd->iconf->secondary_channel == 1)
+               oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE |
+                       HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH;
+       if (hapd->iconf->secondary_channel == -1)
+               oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW |
+                       HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH;
+
+       pos += sizeof(*oper);
+
+       return pos;
+}
+
+
+/*
+op_mode
+Set to 0 (HT pure) under the followign conditions
+       - all STAs in the BSS are 20/40 MHz HT in 20/40 MHz BSS or
+       - all STAs in the BSS are 20 MHz HT in 20 MHz BSS
+Set to 1 (HT non-member protection) if there may be non-HT STAs
+       in both the primary and the secondary channel
+Set to 2 if only HT STAs are associated in BSS,
+       however and at least one 20 MHz HT STA is associated
+Set to 3 (HT mixed mode) when one or more non-HT STAs are associated
+       (currently non-GF HT station is considered as non-HT STA also)
+*/
+int hostapd_ht_operation_update(struct hostapd_iface *iface)
+{
+       u16 cur_op_mode, new_op_mode;
+       int op_mode_changes = 0;
+
+       if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
+               return 0;
+
+       wpa_printf(MSG_DEBUG, "%s current operation mode=0x%X",
+                  __func__, iface->ht_op_mode);
+
+       if (!(iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
+           && iface->num_sta_ht_no_gf) {
+               iface->ht_op_mode |=
+                       HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT;
+               op_mode_changes++;
+       } else if ((iface->ht_op_mode &
+                   HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) &&
+                  iface->num_sta_ht_no_gf == 0) {
+               iface->ht_op_mode &=
+                       ~HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT;
+               op_mode_changes++;
+       }
+
+       if (!(iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) &&
+           (iface->num_sta_no_ht || iface->olbc_ht)) {
+               iface->ht_op_mode |= HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT;
+               op_mode_changes++;
+       } else if ((iface->ht_op_mode &
+                   HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT) &&
+                  (iface->num_sta_no_ht == 0 && !iface->olbc_ht)) {
+               iface->ht_op_mode &=
+                       ~HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT;
+               op_mode_changes++;
+       }
+
+       /* Note: currently we switch to the MIXED op mode if HT non-greenfield
+        * station is associated. Probably it's a theoretical case, since
+        * it looks like all known HT STAs support greenfield.
+        */
+       new_op_mode = 0;
+       if (iface->num_sta_no_ht ||
+           (iface->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT))
+               new_op_mode = OP_MODE_MIXED;
+       else if ((iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)
+                && iface->num_sta_ht_20mhz)
+               new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;
+       else if (iface->olbc_ht)
+               new_op_mode = OP_MODE_MAY_BE_LEGACY_STAS;
+       else
+               new_op_mode = OP_MODE_PURE;
+
+       cur_op_mode = iface->ht_op_mode & HT_INFO_OPERATION_MODE_OP_MODE_MASK;
+       if (cur_op_mode != new_op_mode) {
+               iface->ht_op_mode &= ~HT_INFO_OPERATION_MODE_OP_MODE_MASK;
+               iface->ht_op_mode |= new_op_mode;
+               op_mode_changes++;
+       }
+
+       wpa_printf(MSG_DEBUG, "%s new operation mode=0x%X changes=%d",
+                  __func__, iface->ht_op_mode, op_mode_changes);
+
+       return op_mode_changes;
+}
+
+
+u16 copy_sta_ht_capab(struct sta_info *sta, const u8 *ht_capab,
+                     size_t ht_capab_len)
+{
+       if (!ht_capab ||
+           ht_capab_len < sizeof(struct ieee80211_ht_capabilities)) {
+               sta->flags &= ~WLAN_STA_HT;
+               os_free(sta->ht_capabilities);
+               sta->ht_capabilities = NULL;
+               return WLAN_STATUS_SUCCESS;
+       }
+
+       if (sta->ht_capabilities == NULL) {
+               sta->ht_capabilities =
+                       os_zalloc(sizeof(struct ieee80211_ht_capabilities));
+               if (sta->ht_capabilities == NULL)
+                       return WLAN_STATUS_UNSPECIFIED_FAILURE;
+       }
+
+       sta->flags |= WLAN_STA_HT;
+       os_memcpy(sta->ht_capabilities, ht_capab,
+                 sizeof(struct ieee80211_ht_capabilities));
+
+       return WLAN_STATUS_SUCCESS;
+}
+
+
+static void update_sta_ht(struct hostapd_data *hapd, struct sta_info *sta)
+{
+       u16 ht_capab;
+
+       ht_capab = le_to_host16(sta->ht_capabilities->ht_capabilities_info);
+       wpa_printf(MSG_DEBUG, "HT: STA " MACSTR " HT Capabilities Info: "
+                  "0x%04x", MAC2STR(sta->addr), ht_capab);
+       if ((ht_capab & HT_CAP_INFO_GREEN_FIELD) == 0) {
+               if (!sta->no_ht_gf_set) {
+                       sta->no_ht_gf_set = 1;
+                       hapd->iface->num_sta_ht_no_gf++;
+               }
+               wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - no greenfield, num "
+                          "of non-gf stations %d",
+                          __func__, MAC2STR(sta->addr),
+                          hapd->iface->num_sta_ht_no_gf);
+       }
+       if ((ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET) == 0) {
+               if (!sta->ht_20mhz_set) {
+                       sta->ht_20mhz_set = 1;
+                       hapd->iface->num_sta_ht_20mhz++;
+               }
+               wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - 20 MHz HT, num of "
+                          "20MHz HT STAs %d",
+                          __func__, MAC2STR(sta->addr),
+                          hapd->iface->num_sta_ht_20mhz);
+       }
+}
+
+
+static void update_sta_no_ht(struct hostapd_data *hapd, struct sta_info *sta)
+{
+       if (!sta->no_ht_set) {
+               sta->no_ht_set = 1;
+               hapd->iface->num_sta_no_ht++;
+       }
+       if (hapd->iconf->ieee80211n) {
+               wpa_printf(MSG_DEBUG, "%s STA " MACSTR " - no HT, num of "
+                          "non-HT stations %d",
+                          __func__, MAC2STR(sta->addr),
+                          hapd->iface->num_sta_no_ht);
+       }
+}
+
+
+void update_ht_state(struct hostapd_data *hapd, struct sta_info *sta)
+{
+       if ((sta->flags & WLAN_STA_HT) && sta->ht_capabilities)
+               update_sta_ht(hapd, sta);
+       else
+               update_sta_no_ht(hapd, sta);
+
+       if (hostapd_ht_operation_update(hapd->iface) > 0)
+               ieee802_11_set_beacons(hapd->iface);
+}
+
+
+void hostapd_get_ht_capab(struct hostapd_data *hapd,
+                         struct ieee80211_ht_capabilities *ht_cap,
+                         struct ieee80211_ht_capabilities *neg_ht_cap)
+{
+       u16 cap;
+
+       if (ht_cap == NULL)
+               return;
+       os_memcpy(neg_ht_cap, ht_cap, sizeof(*neg_ht_cap));
+       cap = le_to_host16(neg_ht_cap->ht_capabilities_info);
+       cap &= hapd->iconf->ht_capab;
+       cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED);
+
+       /* FIXME: Rx STBC needs to be handled specially */
+       cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_RX_STBC_MASK);
+       neg_ht_cap->ht_capabilities_info = host_to_le16(cap);
+}
index ebc74d2..dd95402 100644 (file)
@@ -1,7 +1,6 @@
 /*
  * hostapd / Station table
  * Copyright (c) 2002-2008, 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
@@ -157,7 +156,6 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
                        set_beacon++;
        }
 
-#ifdef CONFIG_IEEE80211N
        if (sta->no_ht_gf_set) {
                sta->no_ht_gf_set = 0;
                hapd->iface->num_sta_ht_no_gf--;
@@ -173,11 +171,10 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
                hapd->iface->num_sta_ht_20mhz--;
        }
 
-#ifdef NEED_AP_MLME
+#if defined(NEED_AP_MLME) && defined(CONFIG_IEEE80211N)
        if (hostapd_ht_operation_update(hapd->iface) > 0)
                set_beacon++;
-#endif /* NEED_AP_MLME */
-#endif /* CONFIG_IEEE80211N */
+#endif /* NEED_AP_MLME && CONFIG_IEEE80211N */
 
        if (set_beacon)
                ieee802_11_set_beacons(hapd->iface);