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

Commit caec9112 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: preserve antenna settings



save antenna settings and preserve across resets.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 604eeadd
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -123,6 +123,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc)
	ah->ah_cw_min = AR5K_TUNE_CWMIN;
	ah->ah_cw_min = AR5K_TUNE_CWMIN;
	ah->ah_limit_tx_retries = AR5K_INIT_TX_RETRY;
	ah->ah_limit_tx_retries = AR5K_INIT_TX_RETRY;
	ah->ah_software_retry = false;
	ah->ah_software_retry = false;
	ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT;


	/*
	/*
	 * Find the mac version
	 * Find the mac version
+1 −1
Original line number Original line Diff line number Diff line
@@ -2971,7 +2971,7 @@ ath5k_config(struct ieee80211_hw *hw, u32 changed)
	 * then we must allow the user to set how many tx antennas we
	 * then we must allow the user to set how many tx antennas we
	 * have available
	 * have available
	 */
	 */
	ath5k_hw_set_antenna_mode(ah, AR5K_ANTMODE_DEFAULT);
	ath5k_hw_set_antenna_mode(ah, ah->ah_ant_mode);


unlock:
unlock:
	mutex_unlock(&sc->lock);
	mutex_unlock(&sc->lock);
+1 −0
Original line number Original line Diff line number Diff line
@@ -1929,6 +1929,7 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)


	ah->ah_tx_ant = tx_ant;
	ah->ah_tx_ant = tx_ant;
	ah->ah_ant_mode = ant_mode;
	ah->ah_ant_mode = ant_mode;
	ah->ah_def_ant = def_ant;


	sta_id1 |= use_def_for_tx ? AR5K_STA_ID1_DEFAULT_ANTENNA : 0;
	sta_id1 |= use_def_for_tx ? AR5K_STA_ID1_DEFAULT_ANTENNA : 0;
	sta_id1 |= update_def_on_tx ? AR5K_STA_ID1_DESC_ANTENNA : 0;
	sta_id1 |= update_def_on_tx ? AR5K_STA_ID1_DESC_ANTENNA : 0;