Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39448b0a authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 20f57215

drivers/net/wireless/ath/ath9k/rc.c

+7 −9
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int ath_rc_valid_phyrate(u32 phy, u32 capflag, int ignore_cw) 
}



static inline int

ath_rc_get_nextlowervalid_txrate(const struct ath_rate_table *rate_table,

ath_rc_get_lower_rix(const struct ath_rate_table *rate_table,

		     struct ath_rate_priv *ath_rc_priv,

		     u8 cur_valid_txrate, u8 *next_idx)

{
@@ -852,8 +852,7 @@ static void ath_rc_ratefind(struct ath_softc *sc, 
		/* Get the next tried/allowed rate. No RTS for the next series

		 * after the probe rate

		 */

		ath_rc_get_nextlowervalid_txrate(rate_table, ath_rc_priv,

						 rix, &nrix);

		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);

		ath_rc_rate_set_series(rate_table, &rates[i++], txrc,

				       try_per_rate, nrix, 0);
@@ -870,8 +869,7 @@ static void ath_rc_ratefind(struct ath_softc *sc, 
		if (i + 1 == 4)

			try_per_rate = 4;



		ath_rc_get_nextlowervalid_txrate(rate_table, ath_rc_priv,

						 rix, &nrix);

		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);

		/* All other rates in the series have RTS enabled */

		ath_rc_rate_set_series(rate_table, &rates[i], txrc,

				       try_per_rate, nrix, 1);
@@ -1156,7 +1154,7 @@ static void ath_rc_update_ht(struct ath_softc *sc, 
	if (ath_rc_priv->state[tx_rate].per >= 55 && tx_rate > 0 &&

	    rate_table->info[tx_rate].ratekbps <=

	    rate_table->info[ath_rc_priv->rate_max_phy].ratekbps) {

		ath_rc_get_nextlowervalid_txrate(rate_table, ath_rc_priv,

		ath_rc_get_lower_rix(rate_table, ath_rc_priv,

				     (u8)tx_rate, &ath_rc_priv->rate_max_phy);



		/* Don't probe for a little while. */