Commit 166de3f1 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by Kalle Valo

ath10k: remove supported chain mask

Removing supported chainmask fields as it can be always derived
from num_rf_chains.
Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent b4c306d0
...@@ -745,8 +745,6 @@ struct ath10k { ...@@ -745,8 +745,6 @@ struct ath10k {
int num_started_vdevs; int num_started_vdevs;
/* Protected by conf-mutex */ /* Protected by conf-mutex */
u8 supp_tx_chainmask;
u8 supp_rx_chainmask;
u8 cfg_tx_chainmask; u8 cfg_tx_chainmask;
u8 cfg_rx_chainmask; u8 cfg_rx_chainmask;
......
...@@ -3736,13 +3736,8 @@ static int ath10k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant) ...@@ -3736,13 +3736,8 @@ static int ath10k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
mutex_lock(&ar->conf_mutex); mutex_lock(&ar->conf_mutex);
if (ar->cfg_tx_chainmask) { *tx_ant = ar->cfg_tx_chainmask;
*tx_ant = ar->cfg_tx_chainmask; *rx_ant = ar->cfg_rx_chainmask;
*rx_ant = ar->cfg_rx_chainmask;
} else {
*tx_ant = ar->supp_tx_chainmask;
*rx_ant = ar->supp_rx_chainmask;
}
mutex_unlock(&ar->conf_mutex); mutex_unlock(&ar->conf_mutex);
...@@ -3884,9 +3879,7 @@ static int ath10k_start(struct ieee80211_hw *hw) ...@@ -3884,9 +3879,7 @@ static int ath10k_start(struct ieee80211_hw *hw)
} }
} }
if (ar->cfg_tx_chainmask) __ath10k_set_antenna(ar, ar->cfg_tx_chainmask, ar->cfg_rx_chainmask);
__ath10k_set_antenna(ar, ar->cfg_tx_chainmask,
ar->cfg_rx_chainmask);
/* /*
* By default FW set ARP frames ac to voice (6). In that case ARP * By default FW set ARP frames ac to voice (6). In that case ARP
...@@ -7169,8 +7162,8 @@ int ath10k_mac_register(struct ath10k *ar) ...@@ -7169,8 +7162,8 @@ int ath10k_mac_register(struct ath10k *ar)
BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_MESH_POINT); BIT(NL80211_IFTYPE_MESH_POINT);
ar->hw->wiphy->available_antennas_rx = ar->supp_rx_chainmask; ar->hw->wiphy->available_antennas_rx = ar->cfg_rx_chainmask;
ar->hw->wiphy->available_antennas_tx = ar->supp_tx_chainmask; ar->hw->wiphy->available_antennas_tx = ar->cfg_tx_chainmask;
if (!test_bit(ATH10K_FW_FEATURE_NO_P2P, ar->fw_features)) if (!test_bit(ATH10K_FW_FEATURE_NO_P2P, ar->fw_features))
ar->hw->wiphy->interface_modes |= ar->hw->wiphy->interface_modes |=
......
...@@ -4460,8 +4460,10 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) ...@@ -4460,8 +4460,10 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work)
ar->num_rf_chains = ar->max_spatial_stream; ar->num_rf_chains = ar->max_spatial_stream;
} }
ar->supp_tx_chainmask = (1 << ar->num_rf_chains) - 1; if (!ar->cfg_tx_chainmask) {
ar->supp_rx_chainmask = (1 << ar->num_rf_chains) - 1; ar->cfg_tx_chainmask = (1 << ar->num_rf_chains) - 1;
ar->cfg_rx_chainmask = (1 << ar->num_rf_chains) - 1;
}
if (strlen(ar->hw->wiphy->fw_version) == 0) { if (strlen(ar->hw->wiphy->fw_version) == 0) {
snprintf(ar->hw->wiphy->fw_version, snprintf(ar->hw->wiphy->fw_version,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment