diff mbox series

Revert "wifi: ath11k: call ath11k_mac_fils_discovery() without condition"

Message ID 20231023164120.651151-1-kvalo@kernel.org
State New
Headers show
Series Revert "wifi: ath11k: call ath11k_mac_fils_discovery() without condition" | expand

Commit Message

Kalle Valo Oct. 23, 2023, 4:41 p.m. UTC 
From: Kalle Valo <quic_kvalo@quicinc.com>

This reverts commit e149353e6562f3e3246f75dfc4cca6a0cc5b4efc. The commit caused
QCA6390 hw2.0 firmware WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1 to crash
during disconnect:

[71990.787525] ath11k_pci 0000:72:00.0: firmware crashed: MHI_CB_EE_RDDM

Closes: https://lore.kernel.org/all/87edhu3550.fsf@kernel.org/
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
---
 drivers/net/wireless/ath/ath11k/mac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


base-commit: 5b6e11406d5c198c402e8b7f7085a8c229198ba4

Comments

Kalle Valo Oct. 25, 2023, 10:36 a.m. UTC | #1 
Kalle Valo <kvalo@kernel.org> wrote:

> This reverts commit e149353e6562f3e3246f75dfc4cca6a0cc5b4efc. The commit caused
> QCA6390 hw2.0 firmware WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1 to crash
> during disconnect:
> 
> [71990.787525] ath11k_pci 0000:72:00.0: firmware crashed: MHI_CB_EE_RDDM
> 
> Closes: https://lore.kernel.org/all/87edhu3550.fsf@kernel.org/
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
> Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>

Patch applied to ath-next branch of ath.git, thanks.

f59065401602 Revert "wifi: ath11k: call ath11k_mac_fils_discovery() without condition"
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index ec46e2ee6ddf..7f7b39817773 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3732,7 +3732,9 @@  static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
 				    arvif->vdev_id, ret);
 	}
 
-	ath11k_mac_fils_discovery(arvif, info);
+	if (changed & BSS_CHANGED_FILS_DISCOVERY ||
+	    changed & BSS_CHANGED_UNSOL_BCAST_PROBE_RESP)
+		ath11k_mac_fils_discovery(arvif, info);
 
 	if (changed & BSS_CHANGED_ARP_FILTER) {
 		ipv4_cnt = min(vif->cfg.arp_addr_cnt, ATH11K_IPV4_MAX_COUNT);