diff options
author | David S. Miller <davem@davemloft.net> | 2009-07-08 18:13:13 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-08 18:13:13 -0700 |
commit | d2daeabf62a5fb205d413c35cf604021db17536b (patch) | |
tree | 844ced1a54745c14ea45d33ccad4eae6e7253322 /net/mac80211/rc80211_minstrel.c | |
parent | c3b85423072c0739d76b7c54080d3f3ccc5dad4d (diff) | |
parent | 1ce822fa04fd6878f079461a4b8affe4bb5ec27b (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/rc80211_minstrel.c')
-rw-r--r-- | net/mac80211/rc80211_minstrel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index b218b98fba7f..37771abd8f5a 100644 --- a/net/mac80211/rc80211_minstrel.c +++ b/net/mac80211/rc80211_minstrel.c @@ -66,7 +66,7 @@ rix_to_ndx(struct minstrel_sta_info *mi, int rix) for (i = rix; i >= 0; i--) if (mi->r[i].rix == rix) break; - WARN_ON(mi->r[i].rix != rix); + WARN_ON(i < 0); return i; } @@ -181,6 +181,9 @@ minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, break; ndx = rix_to_ndx(mi, ar[i].idx); + if (ndx < 0) + continue; + mi->r[ndx].attempts += ar[i].count; if ((i != IEEE80211_TX_MAX_RATES - 1) && (ar[i + 1].idx < 0)) |