From patchwork Sun Dec 29 17:27:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 182570 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5471774ild; Sun, 29 Dec 2019 10:01:51 -0800 (PST) X-Google-Smtp-Source: APXvYqw7vZX6HEEvXtp6lclNWrw7CKuipo87q9W+IP/j95AnloLn2O+Qn9tW6SKoKo4gIFqDSnAY X-Received: by 2002:a9d:7357:: with SMTP id l23mr67106096otk.10.1577642511791; Sun, 29 Dec 2019 10:01:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577642511; cv=none; d=google.com; s=arc-20160816; b=Fj5iyzp8KTohvNN3dM4hpUtc4vLtpr60gRms0khi/invmT30K317Uo8HgLGRrx+Zos V0JgCmYw1qBiWlnM40DNx10w+8tzqJXh1qWg53ptpg4pEqzFM6ymwed/h1w2FgvjPMKH tI4Wh6/vArg10n48R8mRdN4QoxuzkRPwzADKNushygnb7KSh1nojqNvKDdnfVOsbgsJP R6UtrrlYawCxlGtnzlS8H8ve4mPPASAcNSPskx1t4t5eTgeFvIkTvtga3m6f5U4Rv7BO qHjH+6Y7J/2nqgePJYi0JrWb9zqwcT3knoqeTaAajnihPcIsy3wfrTX35MbiKHFBQ1JC QFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9zvRnCCLV/eptce2k1Mc7/EWOm7nC7DUjQK5piHmzRU=; b=amiJEoO5enFKymJ+u0WuF4/QK4bAyvs5kNGGGJel2BUu/NydKRnnOz/0jiJfpdW6R6 95eMLcj6W2RzOrEsYjCKmu+GDkCdU1sPwe9LMbPUSPJFG4pbZjPcEjdjICk41cSKQZeB DJ9dCDv6JRHz056S3VSoPkwzUKRhxRr+nf5knTYO8C/HQIUrJFgXut85ByFHDoh4/9lu dBBC1rb/FNITOTovCwazHAjIzqfcoQJx0QOLMnrc19aKH07u8hjzIvDlrLDqNfskpxuC 7MIBErNkMdVPEsLEpqwHtASOEdF5txmbWSHncTEQMYhI3L6sNpqNTf5MLC6TxrhiITrC 3jrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hgkquZ31; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n139si20689896oig.121.2019.12.29.10.01.51; Sun, 29 Dec 2019 10:01:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hgkquZ31; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387742AbfL2SBF (ORCPT + 27 others); Sun, 29 Dec 2019 13:01:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:46416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733097AbfL2R4h (ORCPT ); Sun, 29 Dec 2019 12:56:37 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B0B9222C3; Sun, 29 Dec 2019 17:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642196; bh=rmRl139AxwHsTpMf/zq6Qr0pUL5g6YxMSoOYXSDn98w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hgkquZ316fjiaTl8dAsTrJ1J47BIGAG1M/WNHrfvYuJtLy4JlN3ZbLXNkaPBkO0iO Bkbxh1/b7rLvrM+mpw5GhClWHSM1LLpcp1T0wfigvplFz3S9TV4TDC3U0AInU71OH6 bzROAAcUKb49NMT1aWKlPizs4xkbR0MAKbS8dEV0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 383/434] ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()" Date: Sun, 29 Dec 2019 18:27:16 +0100 Message-Id: <20191229172727.594657975@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson [ 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 Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/mac.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.20.1 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);