ieee80211_txq_setup_flows() lowers the memory limit of the TXQs from 16 MB to 4 MB unless a band of the radio supports VHT, on the grounds that 4 MB is 64 aggregates of the largest 802.11n size. The 6 GHz band has no VHT, so a radio that only has that band gets the 4 MB of an 802.11n radio, and frames queued beyond it are dropped as fq_overmemory. Christopher Griffin saw those drops on the 6 GHz radio of a QCN9074 with ath11k airtime queue limits applied, where the radio ran at 1154 Mbit/s against 1609 and 1622 Mbit/s without them. Count a band with HE like one with VHT. EHT implies HE, so it is covered too. Fixes: 3ff23cd5654b ("mac80211: Set lower memory limit for non-VHT devices") Reported-by: Christopher Griffin Closes: https://lore.kernel.org/all/CAKobHXAfLKmJWSP_xNKwmNVkd4M92XhVXkVMcG5nxCBnbphH5w@mail.gmail.com/ Signed-off-by: Julius Bairaktaris --- I used Claude (Anthropic) to help write these patches. I have reviewed the commit message myself and edited it where needed. net/mac80211/tx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index cb9ecac25a9c..eb8a8441e9b7 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1656,10 +1656,12 @@ int ieee80211_txq_setup_flows(struct ieee80211_local *local) return ret; /* - * If the hardware doesn't support VHT, it is safe to limit the maximum - * queue size. 4 Mbytes is 64 max-size aggregates in 802.11n. + * If the hardware supports neither VHT nor HE, it is safe to limit the + * maximum queue size. 4 Mbytes is 64 max-size aggregates in 802.11n. + * A band without VHT can still have HE, as the 6 GHz band always does. */ for (band = 0; band < NUM_NL80211_BANDS; band++) { + const struct ieee80211_sband_iftype_data *iftd; struct ieee80211_supported_band *sband; sband = local->hw.wiphy->bands[band]; @@ -1667,6 +1669,8 @@ int ieee80211_txq_setup_flows(struct ieee80211_local *local) continue; supp_vht = supp_vht || sband->vht_cap.vht_supported; + for_each_sband_iftype_data(sband, i, iftd) + supp_vht = supp_vht || iftd->he_cap.has_he; } if (!supp_vht) base-commit: e1dd8486807c1acf9551250b7f81e116a21e6ad6 -- 2.53.0