diff options
| author |   Toke Høiland-Jørgensen <toke@redhat.com> | 2019-11-18 22:06:08 -0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2019-11-22 13:36:25 +0100 |
| commit | db3e1c40cf2f973fbdd52ae0b59a9472b1c04f4a (patch) | |
| tree | 31588dcb7a472dee404037552487ea1cbe3f9017 /net/mac80211/ieee80211_i.h | |
| parent | virt_wifi: fix use-after-free in virt_wifi_newlink() (diff) | |
| download | linux-dev-db3e1c40cf2f973fbdd52ae0b59a9472b1c04f4a.tar.xz linux-dev-db3e1c40cf2f973fbdd52ae0b59a9472b1c04f4a.zip | |
mac80211: Import airtime calculation code from mt76
Felix recently added code to calculate airtime of packets to the mt76
driver. Import this into mac80211 so we can use it for airtime queue limit
calculations.
The airtime.c file is copied verbatim from the mt76 driver, and adjusted to
be usable in mac80211. This involves:
- Switching to mac80211 data structures.
- Adding support for 160 MHz channels and HE mode.
- Moving the symbol and duration calculations around a bit to avoid
rounding with the higher rates and longer symbol times used for HE rates.
The per-rate TX rate calculation is also split out to its own function so
it can be used directly for the AQL calculations later.
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20191119060610.76681-3-kyan@google.com
[fix HE_GROUP_IDX() to use 3 * bw, since there are 3 _gi values]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 05406e9c05b3..225ea4e3cd76 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -2249,6 +2249,10 @@ const char *ieee80211_get_reason_code_string(u16 reason_code); extern const struct ethtool_ops ieee80211_ethtool_ops; +u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *pubsta, + int len); #ifdef CONFIG_MAC80211_NOINLINE #define debug_noinline noinline #else |