[PATCH] ath10k: update antenna configuration after setting in fw
From: <hidden>
Date: 2015-10-26 09:22:08
Subsystem:
atheros ath generic utilities, qualcomm atheros ath10k wireless driver, the rest · Maintainers:
Jeff Johnson, Linus Torvalds
From: Manikanta Pubbisetty <redacted> Updating tx/rx antenna configuration in ath10k is done even before it is set in target. If setting of the tx/rx antenna config fails then we will maintain incorrect configuration in ath10k and APIs like get_antenna will provide incorrect information. This patch updates the antenna configuration in ath10k after it is set successfully in target. Signed-off-by: Manikanta Pubbisetty <redacted> --- drivers/net/wireless/ath/ath10k/mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 484c1a1..8d0ce37 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c@@ -3771,9 +3771,6 @@ static int __ath10k_set_antenna(struct ath10k *ar, u32 tx_ant, u32 rx_ant) ath10k_check_chain_mask(ar, tx_ant, "tx"); ath10k_check_chain_mask(ar, rx_ant, "rx"); - ar->cfg_tx_chainmask = tx_ant; - ar->cfg_rx_chainmask = rx_ant; - if ((ar->state != ATH10K_STATE_ON) && (ar->state != ATH10K_STATE_RESTARTED)) return 0;
@@ -3794,6 +3791,9 @@ static int __ath10k_set_antenna(struct ath10k *ar, u32 tx_ant, u32 rx_ant) return ret; } + ar->cfg_tx_chainmask = tx_ant; + ar->cfg_rx_chainmask = rx_ant; + return 0; }
--
1.9.1