From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 13 Jul 2022 08:34:44 +0000 (+0200)
Subject: wifi: mac80211: exclude multicast packets from AQL pending airtime
X-Git-Tag: v6.1-rc5~731^2~64^2~168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51d3cfaf992ff52c2e922dc935a78f415038a2da;p=platform%2Fkernel%2Flinux-starfive.git

wifi: mac80211: exclude multicast packets from AQL pending airtime

In AP mode, multicast traffic is handled very differently from normal traffic,
especially if at least one client is in powersave mode.
This means that multicast packets can be buffered a lot longer than normal
unicast packets, and can eat up the AQL budget very quickly because of the low
data rate.
Along with the recent change to maintain a global PHY AQL limit, this can lead
to significant latency spikes for unicast traffic.

Since queueing multicast to hardware is currently not constrained by AQL limits
anyway, let's just exclude it from the AQL pending airtime calculation entirely.

Fixes: 8e4bac067105 ("wifi: mac80211: add a per-PHY AQL limit to improve fairness")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20220713083444.86129-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b58c85a..6cd3aeb 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3760,7 +3760,7 @@ begin:
 encap_out:
 	IEEE80211_SKB_CB(skb)->control.vif = vif;
 
-	if (vif &&
+	if (tx.sta &&
 	    wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
 		bool ampdu = txq->ac != IEEE80211_AC_VO;
 		u32 airtime;