leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath10k: remove supported chain mask

Browse Source 
Removing supported chainmask fields as it can be always derived
from num_rf_chains.

Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Rajkumar Manoharan 2015-10-27 17:51:11 +05:30 committed by Kalle Valo
parent b4c306d0c5
commit 166de3f189
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath10k/core.h
View File

@ -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;

17
drivers/net/wireless/ath/ath10k/mac.c
View File

@ -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)
} }
} }
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)
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 |=

6
drivers/net/wireless/ath/ath10k/wmi.c
View File

@ -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,