mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-01-28 03:37:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

mac80211: fix division by zero in expected throughput estimation
Some checks are pending
Build Kernel / Build all affected Kernels (push) Waiting to run
Details
Build all core packages / Build all core packages for selected target (push) Waiting to run
Details

Browse source 
Fixes: https://github.com/openwrt/openwrt/issues/19729
Fixes: f10732fb56 ("mac80211: estimate expected throughput if not provided by driver/rc")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2025-08-09 16:47:45 +02:00
parent 7df4f7d709
commit 886c4f054e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kernel/mac80211/patches/subsys/361-mac80211-estimate-expected-throughput-if-not-provide.patch
View file

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2621,6 +2621,27 @@ static inline u64 sta_get_stats_bytes(st
@@ -2621,6 +2621,29 @@ static inline u64 sta_get_stats_bytes(st
return value;
}
@ -33,6 +33,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+
+ duration = ieee80211_rate_expected_tx_airtime(hw, NULL, ri, band, true, 1024);
+ duration += duration >> 4; /* add assumed packet error rate of ~6% */
+ if (!duration)
+ return 0;
+
+ return ((1024 * USEC_PER_SEC) / duration) * 8;
+}
@ -40,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
bool tidstats)
{
@@ -2865,6 +2886,8 @@ void sta_set_sinfo(struct sta_info *sta,
@@ -2865,6 +2888,8 @@ void sta_set_sinfo(struct sta_info *sta,
sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);
thr = sta_get_expected_throughput(sta);