Skip to content

Commit 6a424ef

Browse files
Karthikeyan Periyasamygregkh
authored andcommitted
wifi: ath12k: fix mbssid max interface advertisement
[ Upstream commit 253ec89 ] 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: 519a545 ("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>
1 parent 767d55c commit 6a424ef

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

  • drivers/net/wireless/ath/ath12k

drivers/net/wireless/ath/ath12k/mac.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8610,6 +8610,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
86108610
u32 ht_cap = U32_MAX, antennas_rx = 0, antennas_tx = 0;
86118611
bool is_6ghz = false, is_raw_mode = false, is_monitor_disable = false;
86128612
u8 *mac_addr = NULL;
8613+
u8 mbssid_max_interfaces = 0;
86138614

86148615
wiphy->max_ap_assoc_sta = 0;
86158616

@@ -8653,6 +8654,8 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
86538654
mac_addr = ar->mac_addr;
86548655
else
86558656
mac_addr = ab->mac_addr;
8657+
8658+
mbssid_max_interfaces += TARGET_NUM_VDEVS;
86568659
}
86578660

86588661
wiphy->available_antennas_rx = antennas_rx;
@@ -8744,7 +8747,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
87448747
wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa;
87458748
wiphy->num_iftype_ext_capab = ARRAY_SIZE(ath12k_iftypes_ext_capa);
87468749

8747-
wiphy->mbssid_max_interfaces = TARGET_NUM_VDEVS;
8750+
wiphy->mbssid_max_interfaces = mbssid_max_interfaces;
87488751
wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD;
87498752

87508753
if (is_6ghz) {

0 commit comments

Comments
 (0)