diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-15 13:47:58 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-15 13:47:58 -0500 |
| commit | 42a3b63bb2ca4996a3d1210a004eae2333f1119e (patch) | |
| tree | f61c88fb4483bf75f557105a889e256a4f325c0d /drivers/net/wireless/ath | |
| parent | 3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f (diff) | |
| parent | 78feb35b8161acd95c33a703ed6ab6f554d29387 (diff) | |
| download | op-kernel-dev-42a3b63bb2ca4996a3d1210a004eae2333f1119e.zip op-kernel-dev-42a3b63bb2ca4996a3d1210a004eae2333f1119e.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ath')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 888abc2..528d5f3 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c @@ -1271,7 +1271,9 @@ static void ath_rc_init(struct ath_softc *sc, ath_rc_priv->max_valid_rate = k; ath_rc_sort_validrates(rate_table, ath_rc_priv); - ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4]; + ath_rc_priv->rate_max_phy = (k > 4) ? + ath_rc_priv->valid_rate_index[k-4] : + ath_rc_priv->valid_rate_index[k-1]; ath_rc_priv->rate_table = rate_table; ath_dbg(common, ATH_DBG_CONFIG, |
