aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-07-14 20:14:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:15 -0400
commit39448b0a27529f2feecd876729ef0fba25354363 (patch)
treed4a8f358f28734f93b576303ab340ae9d33650b3
parent20f57215a2ff75f7c2e4004b7583e1fec925679e (diff)
ath9k: rename ath_rc_get_nextlowervalid_txrate()
What this does is get us our next lower rate so call it that, ath_rc_get_lower_rix(). Cc: Derek Smithies <derek@indranet.co.nz> Cc: Chittajit Mitra <Chittajit.Mitra@Atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/rc.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 03e7df42675f..c8f800e6c299 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -501,9 +501,9 @@ static int ath_rc_valid_phyrate(u32 phy, u32 capflag, int ignore_cw)
501} 501}
502 502
503static inline int 503static inline int
504ath_rc_get_nextlowervalid_txrate(const struct ath_rate_table *rate_table, 504ath_rc_get_lower_rix(const struct ath_rate_table *rate_table,
505 struct ath_rate_priv *ath_rc_priv, 505 struct ath_rate_priv *ath_rc_priv,
506 u8 cur_valid_txrate, u8 *next_idx) 506 u8 cur_valid_txrate, u8 *next_idx)
507{ 507{
508 int8_t i; 508 int8_t i;
509 509
@@ -852,8 +852,7 @@ static void ath_rc_ratefind(struct ath_softc *sc,
852 /* Get the next tried/allowed rate. No RTS for the next series 852 /* Get the next tried/allowed rate. No RTS for the next series
853 * after the probe rate 853 * after the probe rate
854 */ 854 */
855 ath_rc_get_nextlowervalid_txrate(rate_table, ath_rc_priv, 855 ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
856 rix, &nrix);
857 ath_rc_rate_set_series(rate_table, &rates[i++], txrc, 856 ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
858 try_per_rate, nrix, 0); 857 try_per_rate, nrix, 0);
859 858
@@ -870,8 +869,7 @@ static void ath_rc_ratefind(struct ath_softc *sc,
870 if (i + 1 == 4) 869 if (i + 1 == 4)
871 try_per_rate = 4; 870 try_per_rate = 4;
872 871
873 ath_rc_get_nextlowervalid_txrate(rate_table, ath_rc_priv, 872 ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
874 rix, &nrix);
875 /* All other rates in the series have RTS enabled */ 873 /* All other rates in the series have RTS enabled */
876 ath_rc_rate_set_series(rate_table, &rates[i], txrc, 874 ath_rc_rate_set_series(rate_table, &rates[i], txrc,
877 try_per_rate, nrix, 1); 875 try_per_rate, nrix, 1);
@@ -1156,8 +1154,8 @@ static void ath_rc_update_ht(struct ath_softc *sc,
1156 if (ath_rc_priv->state[tx_rate].per >= 55 && tx_rate > 0 && 1154 if (ath_rc_priv->state[tx_rate].per >= 55 && tx_rate > 0 &&
1157 rate_table->info[tx_rate].ratekbps <= 1155 rate_table->info[tx_rate].ratekbps <=
1158 rate_table->info[ath_rc_priv->rate_max_phy].ratekbps) { 1156 rate_table->info[ath_rc_priv->rate_max_phy].ratekbps) {
1159 ath_rc_get_nextlowervalid_txrate(rate_table, ath_rc_priv, 1157 ath_rc_get_lower_rix(rate_table, ath_rc_priv,
1160 (u8)tx_rate, &ath_rc_priv->rate_max_phy); 1158 (u8)tx_rate, &ath_rc_priv->rate_max_phy);
1161 1159
1162 /* Don't probe for a little while. */ 1160 /* Don't probe for a little while. */
1163 ath_rc_priv->probe_time = now_msec; 1161 ath_rc_priv->probe_time = now_msec;