diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2019-11-13 12:26:44 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-31 16:46:00 +0100 |
| commit | 1648dcd12745042975521c76e4964f0332b902b9 (patch) | |
| tree | ada47a23fd61f1413ccf4d538d44990905fb440c /drivers/net/wireless/ath/ath10k/mac.c | |
| parent | 1c0a591d14ac588fe5f1c4ec309c0547e7608917 (diff) | |
ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()"
[ 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>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 6 |
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 2b53ea6ca205..36d24ea126a2 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -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); |