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: 179347 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp10100970ilf; Wed, 13 Nov 2019 12:26:55 -0800 (PST) X-Google-Smtp-Source: APXvYqwUIiNujgsY8i1+ky9b6n+HlU0p7CngWq/k9efskbu6jErOnEn/i9+iAkIkpNBzKYSuIw6N X-Received: by 2002:a17:906:5502:: with SMTP id r2mr4842404ejp.3.1573676815017; Wed, 13 Nov 2019 12:26:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573676815; cv=none; d=google.com; s=arc-20160816; b=xC+NxcxxcjpzbaNu5+LNizk5KjzxJZTDGO8+x5KSCqCOV3xCgiq6ys/i5ww+TM76UX 9gSdh98nLL4Gcr5GJ5Ib8zkjhgllqwaQymBhs7Ucr2OsbvIMAd9o4H7Sl2n6olHVJWVb 4lNFAKUQLsPg8zl2yjEYinkfv0Ut8zQVcDUaqHnu3m+JVaF4SyGOfjl5cPytBPHE74xu N5SsEj0UR9ZdYbJpCGiZgoEvjJUp7N85GENDUi2NqXc3EFkfPsM8N6vRUNycp4E66cUY 9M1tplCdBN8eMNbnkyhCRagrK+UvN3xpfH76rXQfjl4puRudu/zJQHYK0XflLK8PwJgi z/4g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Z+jBZPXGfzcnRw7QYo9gRDJnZjTKzZ/V8mqM60vhhaw=; b=AANeLWc0uRjS5vSReJp8nYZ8kWPGn93XhTTlSo+Q+BO6OB0rUrN2ADOtOkfB4Ugy41 OJnDStLLgMUPCjL0WDT6DW0RpAohCS+Bz/U2h/t3cfWzjcXvRHZ42vxoErxwvNT9bB+s q6IeYqXm8a2igFxf4DrYQnz2cecji36/iryyaf7MhF0/QKugWaVYLp1ypB+F46UPDn11 GH/SoujhtYnZ8F1xlQlLWt5LeeGpWg3tb1x7+mSN4kRDGhVrOU90lprVt2DAZMz4PLf/ mkunFJWZM/PbWWrLA/MWh938vw86NOlVTFlsXut8zKJJhZ6eHUpG/c4klqOU7Y73JzQ4 ul3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wi3O4TLR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b13si2012254eja.112.2019.11.13.12.26.54; Wed, 13 Nov 2019 12:26:55 -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=@linaro.org header.s=google header.b=wi3O4TLR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726812AbfKMU0u (ORCPT + 26 others); Wed, 13 Nov 2019 15:26:50 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35574 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726179AbfKMU0u (ORCPT ); Wed, 13 Nov 2019 15:26:50 -0500 Received: by mail-pf1-f194.google.com with SMTP id q13so2416375pff.2 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=AKOuYNl+KOKDv+keXUplvNo1QYAcotTP3bW6Hz6+Wub1k/gCkDhTEeG77sLkBPbeME hFg2jrEf1zRrtEgZBh7DtWSlxAo49zoTBBMBI4fagNuHgeWxl21kqi4dY3zvrmstmqWa NSS96t+lLn7zuSbOAVtWwec4dMtA3dBrwVEqdDF+wwCZ7qjx2BdeU0DaImnr9kHJuuvL X5VAKg3Da7fX98uP5zAwZBFNdDNcJVBHqKsZa+6z3TQuM4yjX+7ecE8FSZJeKAVZwNqu MRPlVVbtsG33Na1k5PGKSgI8xiQFZPxlfNoK3Tq34kLyqtnJt5lHxKm6qWkZK4M0hA/Z XLVg== X-Gm-Message-State: APjAAAVS+O1W2pr/6St5mWZbM6akFLR6O7UxlW68BPgDeFYtLxTgF/Kt 7zcbuhyJryqcsk1lX5a1zfqh+g== 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" Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, jeffrey.l.hugo@gmail.com, wenwen@cs.uga.edu 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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(-) -- 2.23.0 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);