projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
rc.c
diff --git
a/drivers/net/wireless/ath/ath9k/rc.c
b/drivers/net/wireless/ath/ath9k/rc.c
index
888abc2
..
528d5f3
100644
(file)
--- 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->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,
ath_rc_priv->rate_table = rate_table;
ath_dbg(common, ATH_DBG_CONFIG,