]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"
authorBjorn Andersson <bjorn.andersson@linaro.org>
Wed, 13 Nov 2019 20:26:44 +0000 (12:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:46:00 +0000 (16:46 +0100)
[ Upstream commit f4fe2e53349f1072d33c69f484dbf9d77bb8f45a ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ath/ath10k/mac.c

index 2b53ea6ca2057836d35092cb875ebbd0b17b9287..36d24ea126a29d1e2936ab2a6333530dd38211c4 100644 (file)
@@ -6551,12 +6551,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);