diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:35:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:35:41 -0500 |
| commit | 5d22df200beccb1dea26fe4d8684ed93ae2f0aeb (patch) | |
| tree | 05220b08a0c9d170ad88e3b9ed0390750d22d8ea /drivers/net/wireless/ath/ath9k/rc.c | |
| parent | 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (diff) | |
| parent | 78feb35b8161acd95c33a703ed6ab6f554d29387 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/rc.c')
| -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 888abc2be3a5..528d5f3e868c 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, | |||
| 1271 | 1271 | ||
| 1272 | ath_rc_priv->max_valid_rate = k; | 1272 | ath_rc_priv->max_valid_rate = k; |
| 1273 | ath_rc_sort_validrates(rate_table, ath_rc_priv); | 1273 | ath_rc_sort_validrates(rate_table, ath_rc_priv); |
| 1274 | ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4]; | 1274 | ath_rc_priv->rate_max_phy = (k > 4) ? |
| 1275 | ath_rc_priv->valid_rate_index[k-4] : | ||
| 1276 | ath_rc_priv->valid_rate_index[k-1]; | ||
| 1275 | ath_rc_priv->rate_table = rate_table; | 1277 | ath_rc_priv->rate_table = rate_table; |
| 1276 | 1278 | ||
| 1277 | ath_dbg(common, ATH_DBG_CONFIG, | 1279 | ath_dbg(common, ATH_DBG_CONFIG, |