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

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

ath9k: remove unused min rate calculation code 



This is not used, and when we need to get the lowest rate
we should simply use mac80211's own rate_lowest_index(sband, sta).

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 dd190183

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

+9 −24
Original line number Diff line number Diff line
@@ -817,21 +817,11 @@ static void ath_rc_rate_set_rtscts(struct ath_softc *sc, 
static u8 ath_rc_rate_getidx(struct ath_softc *sc,

			     struct ath_rate_priv *ath_rc_priv,

			     const struct ath_rate_table *rate_table,

			     u8 rix, u16 stepdown,

			     u16 min_rate)

			     u8 rix, u16 stepdown)

{

	u32 j;

	u8 nextindex = 0;



	if (min_rate) {

		for (j = RATE_TABLE_SIZE; j > 0; j--) {

			if (ath_rc_get_nextlowervalid_txrate(rate_table,

						ath_rc_priv, rix, &nextindex))

				rix = nextindex;

			else

				break;

		}

	} else {

	for (j = stepdown; j > 0; j--) {

		if (ath_rc_get_nextlowervalid_txrate(rate_table,

					ath_rc_priv, rix, &nextindex))
@@ -839,7 +829,6 @@ static u8 ath_rc_rate_getidx(struct ath_softc *sc, 
		else

			break;

	}

	}

	return rix;

}
@@ -882,7 +871,7 @@ static void ath_rc_ratefind(struct ath_softc *sc, 
		 * after the probe rate

		 */

		nrix = ath_rc_rate_getidx(sc, ath_rc_priv,

					  rate_table, nrix, 1, 0);

					  rate_table, nrix, 1);

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

				       try_per_rate, nrix, 0);
@@ -895,16 +884,12 @@ static void ath_rc_ratefind(struct ath_softc *sc, 


	/* Fill in the other rates for multirate retry */

	for ( ; i < 4; i++) {

		u8 min_rate;



		/* Use twice the number of tries for the last MRR segment. */

		if (i + 1 == 4)

			try_per_rate = 4;



		min_rate = (((i + 1) == 4) && 0);



		nrix = ath_rc_rate_getidx(sc, ath_rc_priv,

					  rate_table, nrix, 1, min_rate);

					  rate_table, nrix, 1);

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

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

				       try_per_rate, nrix, 1);