| Message ID | 0101016eb11a10c9-dd904af5-539a-4c05-9ffc-3a1cc33b99f5-000000@us-west-2.amazonses.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a3c5195a97afdfff1f9ae0569c3a4cd98ebd5696 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [1/9] ath11k: Update tx and rx chain count properly on drv_set_antenna | expand |
Kalle Valo <kvalo@codeaurora.org> wrote: > Set the number of tx and rx chains properly on drv_set_antenna(). > This will ensure the related ht/vht/he caps are properly recalculated > based on the tx/rx chains set. > > Signed-off-by: Sriram R <srirrama@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 9 patches applied to ath-next branch of ath.git, thanks. a3c5195a97af ath11k: Update tx and rx chain count properly on drv_set_antenna c000e56ee6b0 ath11k: Advertise MPDU start spacing as no restriction 5e02bc7354e1 ath11k: fix memory leak in monitor mode 28dee8ef7645 ath11k: fix vht guard interval mapping a9e945eadf17 ath11k: update tx duration in station info b9269a078ae6 ath11k: Skip update peer stats for management packets 0366f42640a4 ath11k: Move mac80211 hw allocation before wmi_init command 9c57d7e3b488 ath11k: Setup REO destination ring before sending wmi_init command fcaf49d0f2dc ath11k: fix indentation in ath11k_mac_prepare_he_mode()
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index 5231c4fa0e38..5ee7c2a1c611 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -3480,6 +3480,8 @@ static int __ath11k_set_antenna(struct ath11k *ar, u32 tx_ant, u32 rx_ant) return ret; } + ar->num_tx_chains = get_num_chains(tx_ant); + ret = ath11k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_RX_CHAIN_MASK, rx_ant, ar->pdev->pdev_id); if (ret) { @@ -3488,6 +3490,8 @@ static int __ath11k_set_antenna(struct ath11k *ar, u32 tx_ant, u32 rx_ant) return ret; } + ar->num_rx_chains = get_num_chains(rx_ant); + /* Reload HT/VHT/HE capability */ ath11k_mac_setup_ht_vht_cap(ar, &ar->pdev->cap, NULL); ath11k_mac_setup_he_cap(ar, &ar->pdev->cap);