8554e22ace
This includes the following commits from upstream Linux between 6.12.44 and 6.12.52: ``` $ git log --reverse --oneline v6.12.44...v6.12.52 -- drivers/net/wireless/ net/mac80211/ net/wireless/ 5b7ae04969f8 wifi: cfg80211: fix use-after-free in cmp_bss() 3e789f8475f6 wifi: brcmfmac: fix use-after-free when rescheduling brcmf_btcoex_info work d9f2fb6a2ac8 wifi: mt76: mt7925: fix locking in mt7925_change_vif_links() 1fb26fd3f601 wifi: mt76: prevent non-offchannel mgmt tx during scan/roc 2aef3667e6b0 wifi: mt76: free pending offchannel tx frames on wcid cleanup e4d5a5fc61fd wifi: mt76: fix linked list corruption c2e32ac3f107 wifi: iwlwifi: uefi: check DSM item validity 609a8ffff5a0 wifi: ath11k: fix group data packet drops during rekey cedbbba8a8e8 wifi: cw1200: cap SSID length in cw1200_do_join() 92bedee7168d wifi: libertas: cap SSID len in lbs_associate() 31229145e6ba wifi: cfg80211: sme: cap SSID length in __cfg80211_connect_result() 06616410a3e5 wifi: mwifiex: Initialize the chan_stats array to zero a001c2f6a40c wifi: mt76: mt7925u: use connac3 tx aggr check in tx complete eefa2ad9009b wifi: mt76: mt7996: Initialize hdr before passing to skb_put_data() 089fd41902ee wifi: mt76: mt7925: fix the wrong bss cleanup for SAP 26618c039b78 wifi: ath11k: update channel list in reg notifier instead reg worker fa4abd439f27 wifi: ath11k: update channel list in worker when wait flag is set 2203ef417044 wifi: wilc1000: avoid buffer overflow in WID string configuration 32adb020b0c3 wifi: mac80211: increase scan_ies_len for S1G 8df33f4d4a0b wifi: mac80211: fix incorrect type for ret 79dc6d4932de wifi: virt_wifi: Fix page fault on connect 1f52119809b7 wifi: ath11k: fix NULL dereference in ath11k_qmi_m3_load() 895cccf639ac wifi: rtw89: fix use-after-free in rtw89_core_tx_kick_off_and_wait() 914d02595ba6 wifi: rtlwifi: rtl8192cu: Don't claim USB ID 07b8:8188 1713796d6538 wifi: rtl8xxxu: Don't claim USB ID 07b8:8188 ``` Removed ath11k/940-ath11k-Revert-clear-the-keys-properly-when-DISABLE_K.patch This problem is fixed by: 609a8ffff5a0 wifi: ath11k: fix group data packet drops during rekey Link: https://github.com/openwrt/openwrt/pull/20311 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From: Zhi-Jun You <hujy652@gmail.com>
|
|
Date: Wed, 6 Aug 2025 15:00:05 +0800
|
|
Subject: [RFC PATCH] wifi: ath10k: support flush_sta method
|
|
|
|
|
|
When a STA is marked as no longer authorized, if the driver doesn't
|
|
implement flush_sta(), mac80211 calls ieee80211_flush_queues() to
|
|
flush hardware queues to avoid sending unencrypted frames.
|
|
|
|
This has became a problem for ath10k because ieee80211_flush_queues()
|
|
will stop all traffic and call ath10k_flush, which waits until the
|
|
whole HW queue is empty. In a busy environment this will trigger a
|
|
timeout warning and stalls other STAs.
|
|
|
|
Fix this by implementing flush_sta method using WMI command to flush
|
|
frames of a specific STA.
|
|
Flushed frames will be marked as discard in tx complete indication.
|
|
|
|
ops->flush_sta will be set to NULL if htt.disable_tx_comp is set to
|
|
true.
|
|
|
|
Tested-on: QCA9984 hw1.0 PCI 10.4-3.9.0.2-00157
|
|
|
|
Signed-off-by: Zhi-Jun You <hujy652@gmail.com>
|
|
Tested-by: Florian Maurer <maurer@fh-aachen.de>
|
|
---
|
|
drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
--- a/drivers/net/wireless/ath/ath10k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath10k/mac.c
|
|
@@ -8135,6 +8135,20 @@ static void ath10k_flush(struct ieee8021
|
|
mutex_unlock(&ar->conf_mutex);
|
|
}
|
|
|
|
+static void ath10k_mac_op_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
|
+ struct ieee80211_sta *sta)
|
|
+{
|
|
+ struct ath10k_vif *arvif = (void *)vif->drv_priv;
|
|
+ struct ath10k *ar = hw->priv;
|
|
+ u32 bitmap = 0xFFFFFFFF;
|
|
+ int ret = 0;
|
|
+
|
|
+ ret = ath10k_wmi_peer_flush(ar, arvif->vdev_id, sta->addr, bitmap);
|
|
+ if (ret)
|
|
+ ath10k_warn(ar, "failed to flush sta (sta %pM)\n",
|
|
+ sta->addr);
|
|
+}
|
|
+
|
|
/* TODO: Implement this function properly
|
|
* For now it is needed to reply to Probe Requests in IBSS mode.
|
|
* Probably we need this information from FW.
|
|
@@ -9486,6 +9500,7 @@ static const struct ieee80211_ops ath10k
|
|
.set_rts_threshold = ath10k_set_rts_threshold,
|
|
.set_frag_threshold = ath10k_mac_op_set_frag_threshold,
|
|
.flush = ath10k_flush,
|
|
+ .flush_sta = ath10k_mac_op_flush_sta,
|
|
.tx_last_beacon = ath10k_tx_last_beacon,
|
|
.set_antenna = ath10k_set_antenna,
|
|
.get_antenna = ath10k_get_antenna,
|
|
@@ -10307,6 +10322,9 @@ int ath10k_mac_register(struct ath10k *a
|
|
if (!ar->hw_params.hw_ops->set_coverage_class)
|
|
ar->ops->set_coverage_class = NULL;
|
|
|
|
+ if (ar->htt.disable_tx_comp)
|
|
+ ar->ops->flush_sta = NULL;
|
|
+
|
|
ret = ath_regd_init(&ar->ath_common.regulatory, ar->hw->wiphy,
|
|
ath10k_reg_notifier);
|
|
if (ret) {
|