Message ID | 20191126022738.29214-1-mareklindner@neomailbox.ch |
---|---|
State | Accepted, archived |
Delegated to: | Simon Wunderlich |
Headers | show |
Series | batman-adv: ELP - use wifi tx bitrate as fallback throughput | expand |
On Tuesday, 26 November 2019 10:27:38 HKT Marek Lindner wrote: > Some wifi drivers (e.g. ath10k) provide per-station rx/tx values but no > estimated throughput. Setting a better estimate than the default 1 MBit > makes these devices work well with B.A.T.M.A.N. V. I have been testing this patch for 2-3 months in production setups and while the approach isn't perfect, it produced acceptable results. Cheers, Marek
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 2614a9ca..1e852d4b 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -107,10 +107,15 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) } if (ret) goto default_throughput; - if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))) - goto default_throughput; - return sinfo.expected_throughput / 100; + if (sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) + return sinfo.expected_throughput / 100; + + /* try to estimate en expected throughput based on reported tx rates */ + if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) + return cfg80211_calculate_bitrate(&sinfo.txrate) / 3; + + goto default_throughput; } /* if not a wifi interface, check if this device provides data via