Fix EVENT_FT_RRB_RX processing

[libeap.git] / hostapd / ieee802_11.c

diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index 3445fff..63f1429 100644 (file)
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -29,7 +29,6 @@
 #include "beacon.h"
 #include "hw_features.h"
 #include "ieee802_11_auth.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "ieee802_1x.h"
 #include "wpa.h"
@@ -1466,7 +1465,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
        struct sta_info *sta;
        int new_assoc = 1;
        struct ieee80211_ht_capabilities ht_cap;
-       int set_flags, flags_and, flags_or;
+       int set_flags, total_flags, flags_and, flags_or;
 
        if (!ok) {
                hostapd_logger(hapd, mgmt->da, HOSTAPD_MODULE_IEEE80211,
@@ -1539,7 +1538,7 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
 
        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,
+                           sta->supported_rates_len, sta->listen_interval,
                            sta->flags & WLAN_STA_HT ? &ht_cap : NULL))
        {
                hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
@@ -1559,13 +1558,14 @@ static void handle_assoc_cb(struct hostapd_data *hapd,
                ap_sta_bind_vlan(hapd, sta, 0);
        }
 
-       set_flags = WLAN_STA_SHORT_PREAMBLE | WLAN_STA_WMM | WLAN_STA_MFP;
+       total_flags = hostapd_sta_flags_to_drv(sta->flags);
+       set_flags = WPA_STA_SHORT_PREAMBLE | WPA_STA_WMM | WPA_STA_MFP;
        if (!hapd->conf->ieee802_1x && !hapd->conf->wpa &&
            sta->flags & WLAN_STA_AUTHORIZED)
-               set_flags |= WLAN_STA_AUTHORIZED;
-       flags_or = sta->flags & set_flags;
-       flags_and = sta->flags | ~set_flags;
-       hostapd_sta_set_flags(hapd, sta->addr, sta->flags,
+               set_flags |= WPA_STA_AUTHORIZED;
+       flags_or = total_flags & set_flags;
+       flags_and = total_flags | ~set_flags;
+       hostapd_sta_set_flags(hapd, sta->addr, total_flags,
                              flags_or, flags_and);
 
        if (sta->auth_alg == WLAN_AUTH_FT)