Skip to content

Commit

Permalink
mac80211: correct legacy rates check in ieee80211_calc_rx_airtime
Browse files Browse the repository at this point in the history
There are no legacy rates on 60GHz or sub-1GHz band, so modify the check.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
Link: https://lore.kernel.org/r/20220308021645.16272-1-MeiChia.Chiu@mediatek.com
[Ghz ->  GHz]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
MeiChia Chiu authored and Johannes Berg committed Mar 11, 2022
1 parent 2916b7a commit 022143d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/mac80211/airtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,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];
Expand Down

0 comments on commit 022143d

Please sign in to comment.