2022-03-08 13:00:25

by MeiChia Chiu

Subject: [PATCH] mac80211: correct legacy rates check in ieee80211_calc_rx_airtime

There are no legacy rates on 60GHz or sub-1Ghz band, so modify the check.

Signed-off-by: Ryder Lee <[email protected]>
Signed-off-by: MeiChia Chiu <[email protected]>
---
net/mac80211/airtime.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c
index 26d2f8ba7029..c0e58eb7c7fb 100644
--- a/net/mac80211/airtime.c
+++ b/net/mac80211/airtime.c
@@ -477,7 +477,9 @@ u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw,
bool sp = status->enc_flags & RX_ENC_FLAG_SHORTPRE;
bool cck;

- if (WARN_ON_ONCE(status->band > NL80211_BAND_5GHZ))
+ /* on 60GHz or sub-1Ghz band, there are no legacy rates */
+ if (WARN_ON_ONCE(status->band == NL80211_BAND_60GHZ ||
+ status->band == NL80211_BAND_S1GHZ))
return 0;

sband = hw->wiphy->bands[status->band];
--
2.18.0

2022-03-09 02:13:41

by Jeff Johnson

Subject: Re: [PATCH] mac80211: correct legacy rates check in ieee80211_calc_rx_airtime

On 3/7/2022 6:16 PM, MeiChia Chiu wrote:
> There are no legacy rates on 60GHz or sub-1Ghz band, so modify the check.

nit: s/Ghz/GHz/ here and in the code comment

>
> Signed-off-by: Ryder Lee <[email protected]>
> Signed-off-by: MeiChia Chiu <[email protected]>
> ---
> net/mac80211/airtime.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c
> index 26d2f8ba7029..c0e58eb7c7fb 100644
> --- a/net/mac80211/airtime.c
> +++ b/net/mac80211/airtime.c
> @@ -477,7 +477,9 @@ u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw,
> bool sp = status->enc_flags & RX_ENC_FLAG_SHORTPRE;
> bool cck;
>
> - if (WARN_ON_ONCE(status->band > NL80211_BAND_5GHZ))
> + /* on 60GHz or sub-1Ghz band, there are no legacy rates */
> + if (WARN_ON_ONCE(status->band == NL80211_BAND_60GHZ ||
> + status->band == NL80211_BAND_S1GHZ))
> return 0;
>
> sband = hw->wiphy->bands[status->band];