wifi: ath12k: fix mbssid max interface advertisement

[ Upstream commit 253ec89c9013b0e61f5c54344df7c065d54934d1 ]

The Current method for advertising the maximum MBSSID interface count
assumes single radio per wiphy (multi wiphy model). However, this
assumption is incorrect for multi radio per wiphy (single wiphy model).
Therefore, populate the parameter for each radio present in the MAC
abstraction layer (ah). This approach ensure scalability for both single
wiphy and multi wiphy models.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1

Fixes: 519a545cfee7 ("wifi: ath12k: advertise driver capabilities for MBSSID and EMA")
Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240613153813.3509837-1-quic_periyasa@quicinc.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 0ed388a6fc804bcf28b0df03a337fa18c357a1ea..ead37a4e002a256b3d47a474042f0bcdc3186625 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -8610,6 +8610,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
        u32 ht_cap = U32_MAX, antennas_rx = 0, antennas_tx = 0;
        bool is_6ghz = false, is_raw_mode = false, is_monitor_disable = false;
        u8 *mac_addr = NULL;
+       u8 mbssid_max_interfaces = 0;
 
        wiphy->max_ap_assoc_sta = 0;
 
@@ -8653,6 +8654,8 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
                        mac_addr = ar->mac_addr;
                else
                        mac_addr = ab->mac_addr;
+
+               mbssid_max_interfaces += TARGET_NUM_VDEVS;
        }
 
        wiphy->available_antennas_rx = antennas_rx;
@@ -8744,7 +8747,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
        wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa;
        wiphy->num_iftype_ext_capab = ARRAY_SIZE(ath12k_iftypes_ext_capa);
 
-       wiphy->mbssid_max_interfaces = TARGET_NUM_VDEVS;
+       wiphy->mbssid_max_interfaces = mbssid_max_interfaces;
        wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD;
 
        if (is_6ghz) {