From patchwork Wed Nov 13 20:26:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11242741 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1FD814ED for ; Wed, 13 Nov 2019 20:26:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A3F2A206E6 for ; Wed, 13 Nov 2019 20:26:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UTSMy0RN"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wi3O4TLR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3F2A206E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=4/vw+R7KSbAhlzyGC+Tt23ridT5jmO9yqSVqhcQXsTc=; b=UTSMy0RNXQ/2SK P6HTSzczEpjbvYtX2K2+Sj+4h0xFZz2K1dN5KiWvcXRfKW1LI20L6tsXNXOuJxzEawD55G48do5PP sHsLKX83YWhDRJtKnceMFZLRitQ8vzrzYYNJZqnlKMqW4t9YEujQGwVDNtBkgspw+d5kLJTRlgva9 yuVEf94K8aYcKtCvCw+n+h0KA0KabwGFBqS9LP1HKJz4OQudOl/HjjVljtCzWQa7tdNlGKFAtMPl1 +1AIJ1qfX6d+heeXXfC9p2/GgBIJSoQH3I6zLahP7ECYxnvLCLEbCMKdCBf2C1ujSY+TPttTVmA+7 VaJ0shoxtO/kAx358wRA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUzE5-0004iz-1U; Wed, 13 Nov 2019 20:26:53 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUzE2-0004iV-Jr for ath10k@lists.infradead.org; Wed, 13 Nov 2019 20:26:51 +0000 Received: by mail-pf1-x443.google.com with SMTP id 193so2384278pfc.13 for ; Wed, 13 Nov 2019 12:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Z+jBZPXGfzcnRw7QYo9gRDJnZjTKzZ/V8mqM60vhhaw=; b=wi3O4TLRwAqZuc7rG1hKf1wffoYiplV9EKCXwbESnVGxc8rWUypX7Jv/gCExV56QvW 0QhlD9bXNDkCV+wjAjAdF8lBbRM+LYHGH8vKSb11Ufa7eRlZg1kqhtWeHEaVEjJHQH6I X7KBoDDQ73vGJIXZJTiImFias1/fOinLl7ftdC9qqfTlmiPjBaf+TB68+FPaMwEAsLm7 uUQu6x6q2bZsomjlGMqdoKtattnlblREftbgb1Jm/TSz9Xz/GzGm3ei1ZZ2pZVK8ddVc FJcmbeOPypuuvLrLTFCOEN1ZMIZHsaicd4CHTy+Zb2Jnwyzkyq6mLORbZCPBJToMWxAo ppqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Z+jBZPXGfzcnRw7QYo9gRDJnZjTKzZ/V8mqM60vhhaw=; b=YPiGnuBUaDStOsSRykuz9g+DKlYHWoPScAblX2CPu97PiZQ8WYvASdlbyz3m/Wx8qA qsc5R663Ig3TMV6MPg6vZGcDpMtRa8pQqxqdEVbkLWAuAqRKsP61r2s2a0Zz5r7h817R HjkROXG75gR4fHXlJT7SMGY3wPz7Le9b7humB3cGgjae7+l7eMowbWfTtVWuSWtUQkRP g6AZbUjxYf3p8nF1icc5kzn7N2oJvfqeQByOPhyV9tJpk8crigP0T5DZfXJZhQKzwQBX vgFT6MbPDnntxpNiHBpzGnNJRfFmikKCyr3br5ShNOtR95rNgumVlrqHEWhUko+3VEPO XrXg== X-Gm-Message-State: APjAAAWmQHtanhm0NkpOPGf/f3XnGbC5vr37l6HqAB0cPadazJzFdmHa Jk2hzusGbc2LXJQZMq3cQrbRng== X-Google-Smtp-Source: APXvYqws5sHFjkVpWCAoo2wwOeNcsN0HZ1YtKA/fi79+wXnJUg21ygBsmcG+kSht7hkEW7DWgMr0OA== X-Received: by 2002:a63:364d:: with SMTP id d74mr5862446pga.408.1573676809438; Wed, 13 Nov 2019 12:26:49 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id a145sm3991905pfa.7.2019.11.13.12.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 12:26:48 -0800 (PST) From: Bjorn Andersson To: Kalle Valo , "David S. Miller" Subject: [PATCH] ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()" Date: Wed, 13 Nov 2019 12:26:44 -0800 Message-Id: <20191113202644.3673049-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191113_122650_660541_37749596 X-CRM114-Status: UNSURE ( 7.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wenwen@cs.uga.edu, jeffrey.l.hugo@gmail.com, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, linux-arm-msm@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org '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 --- drivers/net/wireless/ath/ath10k/mac.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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);