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

Commit fa09632b authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Remove ununsed ack duration stuff with long/short preamble 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f40154e7

drivers/net/wireless/ath9k/rc.c

+0 −27
Original line number Diff line number Diff line
@@ -1656,27 +1656,6 @@ static struct rate_control_ops ath_rate_ops = { 
	.free_sta = ath_rate_free_sta,

};



static void ath_setup_rate_table(struct ath_softc *sc,

				 struct ath_rate_table *rate_table)

{

	int i;



	for (i = 0; i < rate_table->rate_cnt; i++) {

		u8 cix = rate_table->info[i].ctrl_rate;



		rate_table->info[i].lpAckDuration =

			ath9k_hw_computetxtime(sc->sc_ah, rate_table,

					       WLAN_CTRL_FRAME_SIZE,

					       cix,

					       false);

		rate_table->info[i].spAckDuration =

			ath9k_hw_computetxtime(sc->sc_ah, rate_table,

					       WLAN_CTRL_FRAME_SIZE,

					       cix,

					       true);

	}

}



void ath_rate_attach(struct ath_softc *sc)

{

	sc->hw_rate_table[ATH9K_MODE_11B] =
@@ -1697,12 +1676,6 @@ void ath_rate_attach(struct ath_softc *sc) 
		&ar5416_11ng_ratetable;

	sc->hw_rate_table[ATH9K_MODE_11NG_HT40MINUS] =

		&ar5416_11ng_ratetable;



	ath_setup_rate_table(sc, &ar5416_11b_ratetable);

	ath_setup_rate_table(sc, &ar5416_11a_ratetable);

	ath_setup_rate_table(sc, &ar5416_11g_ratetable);

	ath_setup_rate_table(sc, &ar5416_11na_ratetable);

	ath_setup_rate_table(sc, &ar5416_11ng_ratetable);

}



int ath_rate_control_register(void)

drivers/net/wireless/ath9k/rc.h

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ struct ath_rate_table { 
		u8 sgi_index;

		u8 ht_index;

		u32 max_4ms_framelen;

		u16 lpAckDuration;

		u16 spAckDuration;

	} info[RATE_TABLE_SIZE];

	u32 probe_interval;

	u32 rssi_reduce_interval;