wifi: mac80211: Sanity check tx bitrate if not provided by driver

If the driver doesn't fill NL80211_STA_INFO_TX_BITRATE in sta_set_sinfo()
then as a fallback sta->deflink.tx_stats.last_rate is used.  Unfortunately
there's no guarantee that this has actually been set before it's used.

Originally found when 'iw <dev> link' would always return a tx rate of
6Mbps regardless of actual link speed for the QCA9337 running firmware
WLAN.TF.2.1-00021-QCARMSWP-1 in my netbook.

Use the sanity check logic from ieee80211_fill_rx_status() and refactor
that to use the new inline function.

Signed-off-by: Stephen Douthit <stephen.douthit@gmail.com>
Link: https://lore.kernel.org/r/20230213204024.3377-1-stephen.douthit@gmail.com
[change to bool ..._rate_valid() instead of int ..._rate_invalid()]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 09fe4601bf592333be5659bc65a174f02d1eb7b2..8d993f6ab91938147c3476b7cfa97651aca919ff 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1078,6 +1078,11 @@ struct ieee80211_tx_rate {
 
 #define IEEE80211_MAX_TX_RETRY         31
 
+static inline bool ieee80211_rate_valid(struct ieee80211_tx_rate *rate)
+{
+       return rate->idx >= 0 && rate->count > 0;
+}
+
 static inline void ieee80211_rate_set_vht(struct ieee80211_tx_rate *rate,
                                          u8 mcs, u8 nss)
 {

diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c
index 14be7b526f1d3e50afcb63399959f1e807e89658..fdf8b658fede8eff75ea4f676fb03bfb6baba0ff 100644 (file)
--- a/net/mac80211/airtime.c
+++ b/net/mac80211/airtime.c
@@ -557,7 +557,7 @@ static int ieee80211_fill_rx_status(struct ieee80211_rx_status *stat,
        if (ieee80211_fill_rate_info(hw, stat, band, ri))
                return 0;
 
-       if (rate->idx < 0 || !rate->count)
+       if (!ieee80211_rate_valid(rate))
                return -1;
 
        if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 7243c6aa216135ce912dd9da9b86b82c2ed99b77..ba36fc29e5324da33cc26648d936b2ee6ba2a7d3 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2703,7 +2703,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
        }
 
        if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) &&
-           !sta->sta.valid_links) {
+           !sta->sta.valid_links &&
+           ieee80211_rate_valid(&sta->deflink.tx_stats.last_rate)) {
                sta_set_rate_info_tx(sta, &sta->deflink.tx_stats.last_rate,
                                     &sinfo->txrate);
                sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);