ath9k: index out of bounds

2/2

---
 drivers/net/wireless/ath/ath9k/rc.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
index 4c0d36a..1809409 100644
@@ -1092,8 +1092,7 @@ static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
 	if (!(rate->flags & IEEE80211_TX_RC_MCS))
 		return rate->idx;
 
-	while (rate->idx > mcs_rix_off[i] &&
-	       i < ARRAY_SIZE(mcs_rix_off)) {
+	while (i < ARRAY_SIZE(mcs_rix_off) && rate->idx > mcs_rix_off[i]) {
 		rix++; i++;
 	}
 

index 4c0d36a..1809409 100644

@@ -1092,8 +1092,7 @@ static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
 ? ? ? ?if (!(rate->flags & IEEE80211_TX_RC_MCS))
 ? ? ? ? ? ? ? ?return rate->idx;
 
- ? ? ? while (rate->idx > mcs_rix_off[i] &&
- ? ? ? ? ? ? ?i < ARRAY_SIZE(mcs_rix_off)) {
+ ? ? ? while (i < ARRAY_SIZE(mcs_rix_off) && rate->idx > mcs_rix_off[i]) {
 ? ? ? ? ? ? ? ?rix++; i++;
 ? ? ? ?}
 


roel