Commit 4e990018 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: remove sc->cur_rate_table and sc->cur_rate_mode 



Set the rate table in the rc module properly based on band and
HT capabilities instead, which was already partially done, but
not for every mode.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 772d5515

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −2
Original line number Diff line number Diff line
@@ -623,8 +623,6 @@ struct ath_softc { 
	struct ath_rx rx;

	struct ath_tx tx;

	struct ath_beacon beacon;

	const struct ath_rate_table *cur_rate_table;

	enum wireless_mode cur_rate_mode;

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];



	struct ath_led radio_led;

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

+0 −35
Original line number Diff line number Diff line
@@ -18,36 +18,6 @@ 
#include "ath9k.h"

#include "btcoex.h"



static void ath_cache_conf_rate(struct ath_softc *sc,

				struct ieee80211_conf *conf)

{

	switch (conf->channel->band) {

	case IEEE80211_BAND_2GHZ:

		if (conf_is_ht20(conf))

			sc->cur_rate_mode = ATH9K_MODE_11NG_HT20;

		else if (conf_is_ht40_minus(conf))

			sc->cur_rate_mode = ATH9K_MODE_11NG_HT40MINUS;

		else if (conf_is_ht40_plus(conf))

			sc->cur_rate_mode = ATH9K_MODE_11NG_HT40PLUS;

		else

			sc->cur_rate_mode = ATH9K_MODE_11G;

		break;

	case IEEE80211_BAND_5GHZ:

		if (conf_is_ht20(conf))

			sc->cur_rate_mode = ATH9K_MODE_11NA_HT20;

		else if (conf_is_ht40_minus(conf))

			sc->cur_rate_mode = ATH9K_MODE_11NA_HT40MINUS;

		else if (conf_is_ht40_plus(conf))

			sc->cur_rate_mode = ATH9K_MODE_11NA_HT40PLUS;

		else

			sc->cur_rate_mode = ATH9K_MODE_11A;

		break;

	default:

		BUG_ON(1);

		break;

	}

}



static void ath_update_txpow(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;
@@ -306,7 +276,6 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, 
		goto ps_restore;

	}



	ath_cache_conf_rate(sc, &hw->conf);

	ath_update_txpow(sc);

	ath9k_hw_set_interrupts(ah, ah->imask);
@@ -1013,8 +982,6 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
	 * that changes the channel so update any state that

	 * might change as a result.

	 */

	ath_cache_conf_rate(sc, &hw->conf);



	ath_update_txpow(sc);



	if ((sc->sc_flags & SC_OP_BEACONS) || !(sc->sc_flags & (SC_OP_OFFCHANNEL)))
@@ -1221,8 +1188,6 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	if (ah->caps.hw_caps & ATH9K_HW_CAP_HT)

		ah->imask |= ATH9K_INT_CST;



	ath_cache_conf_rate(sc, &hw->conf);



	sc->sc_flags &= ~SC_OP_INVALID;



	/* Disable BMISS interrupt when we're not associated */

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

+8 −16
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, 
	 */

	try_per_rate = 4;



	rate_table = sc->cur_rate_table;

	rate_table = ath_rc_priv->rate_table;

	rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe);



	/*
@@ -1048,7 +1048,7 @@ static void ath_rc_update_ht(struct ath_softc *sc, 
	int rate;

	u8 last_per;

	bool state_change = false;

	const struct ath_rate_table *rate_table = sc->cur_rate_table;

	const struct ath_rate_table *rate_table = ath_rc_priv->rate_table;

	int size = ath_rc_priv->rate_table_size;



	if ((tx_rate < 0) || (tx_rate > rate_table->rate_cnt))
@@ -1150,7 +1150,7 @@ static void ath_rc_tx_status(struct ath_softc *sc, 
	u8 flags;

	u32 i = 0, rix;



	rate_table = sc->cur_rate_table;

	rate_table = ath_rc_priv->rate_table;



	/*

	 * If the first rate is not the final index, there
@@ -1231,7 +1231,6 @@ struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc, 
	ath_print(common, ATH_DBG_CONFIG,

		  "Choosing rate table for mode: %d\n", mode);



	sc->cur_rate_mode = mode;

	return hw_rate_table[mode];

}
@@ -1303,7 +1302,6 @@ 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->rate_max_phy = ath_rc_priv->valid_rate_index[k-4];

	sc->cur_rate_table = rate_table;

	ath_rc_priv->rate_table = rate_table;



	ath_print(common, ATH_DBG_CONFIG,
@@ -1439,7 +1437,8 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 
		}

	}



	ath_debug_stat_rc(ath_rc_priv, ath_rc_get_rateindex(sc->cur_rate_table,

	ath_debug_stat_rc(ath_rc_priv,

		ath_rc_get_rateindex(ath_rc_priv->rate_table,

			&tx_info->status.rates[final_ts_idx]));

}
@@ -1480,14 +1479,8 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband, 


	/* Choose rate table first */



	if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) ||

	    (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT) ||

	    (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)) {

	rate_table = ath_choose_rate_table(sc, sband->band,

	                      sta->ht_cap.ht_supported, is_cw40);

	} else {

		rate_table = hw_rate_table[sc->cur_rate_mode];

	}



	ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta, is_cw40, is_sgi);

	ath_rc_init(sc, priv_sta, sband, sta, rate_table);
@@ -1536,7 +1529,6 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband, 
			ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_CONFIG,

				  "Operating HT Bandwidth changed to: %d\n",

				  sc->hw->conf.channel_type);

			sc->cur_rate_table = hw_rate_table[sc->cur_rate_mode];

		}

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE