aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath10k
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2019-11-13 12:26:44 -0800
committerKalle Valo <kvalo@codeaurora.org>2019-11-15 08:56:38 +0200
commitf4fe2e53349f1072d33c69f484dbf9d77bb8f45a (patch)
treebcdac3e92363aaede8d409f748f4437c1134f3cf /drivers/net/wireless/ath/ath10k
parentath10k: disable cpuidle during downloading firmware (diff)
downloadlinux-dev-f4fe2e53349f1072d33c69f484dbf9d77bb8f45a.tar.xz
linux-dev-f4fe2e53349f1072d33c69f484dbf9d77bb8f45a.zip
ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k')
-rw-r--r--drivers/net/wireless/ath/ath10k/mac.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 5e3450cfb07b..83cc8778ca1e 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6639,12 +6639,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);