wifi: ath11k: move HE MCS mapper to a separate function

Move HE MCS mapper to a separate function and call new function
in ath11k_mac_copy_he_cap().

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00356-QCAHKSWPL_SILICONZ-1

Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/1666128501-12364-4-git-send-email-quic_msinada@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 7c4f424180dcd9984ab3cc4262339c510b766ed4..0835ab8b389a647cb82bd79a354b594aebd55a67 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -5483,6 +5483,27 @@ static __le16 ath11k_mac_setup_he_6ghz_cap(struct ath11k_pdev_cap *pcap,
        return cpu_to_le16(bcap->he_6ghz_capa);
 }
 
+static void ath11k_mac_set_hemcsmap(struct ath11k *ar,
+                                   struct ath11k_pdev_cap *cap,
+                                   struct ieee80211_sta_he_cap *he_cap,
+                                   int band)
+{
+       struct ath11k_band_cap *band_cap = &cap->band[band];
+
+       he_cap->he_mcs_nss_supp.rx_mcs_80 =
+               cpu_to_le16(band_cap->he_mcs & 0xffff);
+       he_cap->he_mcs_nss_supp.tx_mcs_80 =
+               cpu_to_le16(band_cap->he_mcs & 0xffff);
+       he_cap->he_mcs_nss_supp.rx_mcs_160 =
+               cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
+       he_cap->he_mcs_nss_supp.tx_mcs_160 =
+               cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
+       he_cap->he_mcs_nss_supp.rx_mcs_80p80 =
+               cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
+       he_cap->he_mcs_nss_supp.tx_mcs_80p80 =
+               cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
+}
+
 static int ath11k_mac_copy_he_cap(struct ath11k *ar,
                                  struct ath11k_pdev_cap *cap,
                                  struct ieee80211_sband_iftype_data *data,
@@ -5544,18 +5565,7 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar,
                        break;
                }
 
-               he_cap->he_mcs_nss_supp.rx_mcs_80 =
-                       cpu_to_le16(band_cap->he_mcs & 0xffff);
-               he_cap->he_mcs_nss_supp.tx_mcs_80 =
-                       cpu_to_le16(band_cap->he_mcs & 0xffff);
-               he_cap->he_mcs_nss_supp.rx_mcs_160 =
-                       cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
-               he_cap->he_mcs_nss_supp.tx_mcs_160 =
-                       cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
-               he_cap->he_mcs_nss_supp.rx_mcs_80p80 =
-                       cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
-               he_cap->he_mcs_nss_supp.tx_mcs_80p80 =
-                       cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
+               ath11k_mac_set_hemcsmap(ar, cap, he_cap, band);
 
                memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
                if (he_cap_elem->phy_cap_info[6] &