86bc29e4a8
[mac80211] ca5ee6e mac80211: Fix potential endless loop 2c14710 mac80211: add more AQL fixes/improvements 91fb3ce mac80211: remove an obsolete patch that is no longer doing anything useful acf1733 mac80211: add preliminary support for enabling 802.11ax in config d717343 mac80211: update encap offload patches to the latest version 673062f mac80211: allow bigger A-MSDU sizes in VHT, even if HT is limited caf7277 mac80211: do not allow bigger VHT MPDUs than the hardware supports cd36c0d mac80211: select the first available channel for 5GHz interfaces 1c6d456 mac80211: fix regression in station connection monitor optimization 4bd7689 mac80211: update sta connection monitor regression fix [target] Sync: at91, ath25, ath79, lantiq, mediatek, mvebu.
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 27 Aug 2020 12:44:36 +0200
|
|
Subject: [PATCH] mac80211: extend AQL aggregation estimation to HE and fix
|
|
unit mismatch
|
|
|
|
The unit of the return value of ieee80211_get_rate_duration is nanoseconds, not
|
|
milliseconds. Adjust the duration checks to account for that.
|
|
For higher data rates, allow larger estimated aggregation sizes, and add some
|
|
values for HE as well, which can use much larger aggregates.
|
|
Since small packets with high data rates can now lead to duration values too
|
|
small for info->tx_time_est, return a minimum of 4us.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/mac80211/airtime.c
|
|
+++ b/net/mac80211/airtime.c
|
|
@@ -668,20 +668,26 @@ u32 ieee80211_calc_expected_tx_airtime(s
|
|
* This will not be very accurate, but much better than simply
|
|
* assuming un-aggregated tx in all cases.
|
|
*/
|
|
- if (duration > 400) /* <= VHT20 MCS2 1S */
|
|
+ if (duration > 400 * 1024) /* <= VHT20 MCS2 1S */
|
|
agg_shift = 1;
|
|
- else if (duration > 250) /* <= VHT20 MCS3 1S or MCS1 2S */
|
|
+ else if (duration > 250 * 1024) /* <= VHT20 MCS3 1S or MCS1 2S */
|
|
agg_shift = 2;
|
|
- else if (duration > 150) /* <= VHT20 MCS5 1S or MCS3 2S */
|
|
+ else if (duration > 150 * 1024) /* <= VHT20 MCS5 1S or MCS2 2S */
|
|
agg_shift = 3;
|
|
- else
|
|
+ else if (duration > 70 * 1024) /* <= VHT20 MCS5 2S */
|
|
agg_shift = 4;
|
|
+ else if (stat.encoding != RX_ENC_HE ||
|
|
+ duration > 20 * 1024) /* <= HE40 MCS6 2S */
|
|
+ agg_shift = 5;
|
|
+ else
|
|
+ agg_shift = 6;
|
|
|
|
duration *= len;
|
|
duration /= AVG_PKT_SIZE;
|
|
duration /= 1024;
|
|
+ duration += (overhead >> agg_shift);
|
|
|
|
- return duration + (overhead >> agg_shift);
|
|
+ return max_t(u32, duration, 4);
|
|
}
|
|
|
|
if (!conf)
|