ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"
diff mbox series

Message ID 20191113202644.3673049-1-bjorn.andersson@linaro.org
State Accepted
Commit f4fe2e53349f1072d33c69f484dbf9d77bb8f45a
Delegated to: Kalle Valo
Headers show
Series
  • ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"
Related show

Commit Message

Bjorn Andersson Nov. 13, 2019, 8:26 p.m. UTC
'334f5b61a6f2 ("ath10k: add cleanup in ath10k_sta_state()")' causes
ath10k_snoc on Qualcomm MSM8998, SDM845 and QCS404 platforms to trigger
an assert in the firmware:

err_qdi.c:456:EF:wlan_process:1:cmnos_thread.c:3900:Asserted in wlan_vdev.c:_wlan_vdev_up:3219

Revert the offending commit for now.

This reverts commit 334f5b61a6f29834e881923b98d1e27e5ce9620d.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/net/wireless/ath/ath10k/mac.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Kalle Valo Nov. 15, 2019, 6:58 a.m. UTC | #1
Bjorn Andersson <bjorn.andersson@linaro.org> wrote:

> This reverts commit 334f5b61a6f29834e881923b98d1e27e5ce9620d.
> 
> This caused ath10k_snoc on Qualcomm MSM8998, SDM845 and QCS404 platforms to
> trigger an assert in the firmware:
> 
> err_qdi.c:456:EF:wlan_process:1:cmnos_thread.c:3900:Asserted in wlan_vdev.c:_wlan_vdev_up:3219
> 
> Revert the offending commit for now.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

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

f4fe2e53349f ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"

Patch
diff mbox series

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e8bdb2ba9b18..68f7d7246ef2 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6638,12 +6638,8 @@  static int ath10k_sta_state(struct ieee80211_hw *hw,
 
 		spin_unlock_bh(&ar->data_lock);
 
-		if (!sta->tdls) {
-			ath10k_peer_delete(ar, arvif->vdev_id, sta->addr);
-			ath10k_mac_dec_num_stations(arvif, sta);
-			kfree(arsta->tx_stats);
+		if (!sta->tdls)
 			goto exit;
-		}
 
 		ret = ath10k_wmi_update_fw_tdls_state(ar, arvif->vdev_id,
 						      WMI_TDLS_ENABLE_ACTIVE);