diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-11-14 15:28:19 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-17 15:43:56 -0500 |
| commit | b79296beeba470074737a7d5a941f4ddd64863d8 (patch) | |
| tree | 8dc3cac0d81d9036ed96832d538a3d1811135a51 | |
| parent | a7f23f0a8f6be9d95d8110d34b21ccce03111447 (diff) | |
| download | linux-3.10-b79296beeba470074737a7d5a941f4ddd64863d8.tar.gz linux-3.10-b79296beeba470074737a7d5a941f4ddd64863d8.tar.bz2 linux-3.10-b79296beeba470074737a7d5a941f4ddd64863d8.zip | |
mac80211: Check rate->idx before rate->count
The drivers are not required to fill in rate->count if rate->idx is set
to -1. Hence, we should first check rate->idx before accessing
rate->count.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index cdb28535716..972244f83c0 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -300,10 +300,10 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) static bool minstrel_ht_txstat_valid(struct ieee80211_tx_rate *rate) { - if (!rate->count) + if (rate->idx < 0) return false; - if (rate->idx < 0) + if (!rate->count) return false; return !!(rate->flags & IEEE80211_TX_RC_MCS); |