4779b731d4
Manually refreshed: 010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch 110-mbedtls-TLS-crypto-option-initial-port.patch 140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch 301-mesh-noscan.patch 601-ucode_support.patch 780-Implement-APuP-Access-Point-Micro-Peering.patch Dropped upstreamed: 330-nl80211_fix_set_freq.patch 804-hostapd-Fix-clearing-up-settings-for-color-switch.patch Automatically rebased all other patches. Tested-by: Rany Hany <rany_hany@riseup.net> # ramips_mt7621/asus_rt-ax53u, mt7622/xiaomi_redmi-router-ax6s Tested-by: Andre Heider <a.heider@gmail.com> # filogic/openwrt_one, ramips_mt7621/netgear_wac124 Tested-by: Agustin Lorenzo <agustin.lorenzo@thinco.es> # qualcommax/ipq807x (AX3600) Tested-by: Daniel Pawlik <pawlik.dan@gmail.com> # BPi-R4 with mt7996 Signed-off-by: Rany Hany <rany_hany@riseup.net>
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Tue, 25 May 2021 10:50:16 +0200
|
|
Subject: [PATCH] fix adding back stations after a missed deauth/disassoc
|
|
|
|
--- a/src/ap/ieee802_11.c
|
|
+++ b/src/ap/ieee802_11.c
|
|
@@ -4894,6 +4894,13 @@ static int add_associated_sta(struct hos
|
|
* drivers to accept the STA parameter configuration. Since this is
|
|
* after a new FT-over-DS exchange, a new TK has been derived, so key
|
|
* reinstallation is not a concern for this case.
|
|
+ *
|
|
+ * If the STA was associated and authorized earlier, but came for a new
|
|
+ * connection (!added_unassoc + !reassoc), remove the existing STA entry
|
|
+ * so that it can be re-added. This case is rarely seen when the AP could
|
|
+ * not receive the deauth/disassoc frame from the STA. And the STA comes
|
|
+ * back with new connection within a short period or before the inactive
|
|
+ * STA entry is removed from the list.
|
|
*/
|
|
wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
|
|
" (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
|
|
@@ -4907,7 +4914,8 @@ static int add_associated_sta(struct hos
|
|
(!(sta->flags & WLAN_STA_AUTHORIZED) ||
|
|
(reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
|
|
(!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&
|
|
- !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)))) {
|
|
+ !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)) ||
|
|
+ (!reassoc && (sta->flags & WLAN_STA_AUTHORIZED)))) {
|
|
hostapd_drv_sta_remove(hapd, sta->addr);
|
|
wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
|
|
set = 0;
|