Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp120221ybg; Mon, 8 Jun 2020 18:10:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydUKn9HmnU5Znb55mRfBcALQr1UF8SwFqwIsi2w+2owxyxJaz59cCxJs83mFvaY/XF0kj+ X-Received: by 2002:a50:b022:: with SMTP id i31mr23859368edd.301.1591665031199; Mon, 08 Jun 2020 18:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591665031; cv=none; d=google.com; s=arc-20160816; b=kooSMw/fnpEEr2FNIiSWGo0GQQkora8kg9qbEzq/K24TkoLcVd0TN1VootM1fmVN6l CgoeqfwHTxl/8AjjmHzlQSWNMI7WlCJ54162IikZu5MJvRZdsEH5C7dmd0UsOWvmGNlI DTTB6yPqGL34ldbk0hyB6UcCx39540BwTc7pJK2PbygJWtb5kjF/r0tGP4EWiZadiFw9 bx3UhxaKmKAk3xOMEOveSbIJzw/G+wV1ugrTfSVetC/LEbt/Ah3xnpPNorKcFEl/21j2 AJdQYYKMaHgmR20bQee5pQ0eVnubHhi49wX+EpC7iUNvL3LRxA/OlJUkKtkV99o7j0+j 8GYA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cGYSLRWFLtn8SdsHfvXxvBxbDZ7/xmH815ArD8pHGkA=; b=LKs5rQT1TtWSYs/I6hEEmOylz/+g+VUw7NsOVOLczyxhPBqSo5UDkfHz2mvNosKqnA +0RO2E6tR3hym61nyOmwUmuyvhZM/6rkRoJp+ZCbc+IhEAI9MiQf0Kj5qHuqUWOOybbg 8wtbNuSCfJQe/XPSIWn/XgGacRx4lLxZ0QBqjNGVx4Yh29N93/0oZaKwPlXdsnG8+wR+ jsq4udk6xJxTmfwEBxB1b+aIt9E9SpUz21F6zWBvifty0L1E2v6vBzg4/+anEuGG9cbu zgy6dUozRBjxmxyoLuwEWB5IZNS5fGDBJrj8lsFDzYoafXDNVE1SuGghBZyKpwBLOqxm 9r9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pFxbsYJA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dp8si11791779ejc.281.2020.06.08.18.10.08; Mon, 08 Jun 2020 18:10:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pFxbsYJA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388227AbgFIBIZ (ORCPT + 99 others); Mon, 8 Jun 2020 21:08:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:50204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727068AbgFHXGr (ORCPT ); Mon, 8 Jun 2020 19:06:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5C3D20870; Mon, 8 Jun 2020 23:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657606; bh=lg0K0W/aYAUtFjJepmp4AK6Gf1LVgkJTHCed3bKP0mQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pFxbsYJA9VZTAxKBjQ2141nT7rrKv3Y97/qrZDnhRcUydnJxcvn1Hh+T+eCw6WKKc 7TlBrcWWYXIbaMH8kOq74DVaHswYos4UieSzRBZF/n5rXG65sJY5EQJN6daEYhrMJm CrcDSCVJjwzi6J2F5OgisYQbceCazmM75HnNxgUY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wen Gong , Kalle Valo , Sasha Levin , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 031/274] ath10k: remove the max_sched_scan_reqs value Date: Mon, 8 Jun 2020 19:02:04 -0400 Message-Id: <20200608230607.3361041-31-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wen Gong [ Upstream commit d431f8939c1419854dfe89dd345387f5397c6edd ] The struct cfg80211_wowlan of NET_DETECT WoWLAN feature share the same struct cfg80211_sched_scan_request together with scheduled scan request feature, and max_sched_scan_reqs of wiphy is only used for sched scan, and ath10k does not support scheduled scan request feature, so ath10k does not set flag NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR, but ath10k set max_sched_scan_reqs of wiphy to a non zero value 1, then function nl80211_add_commands_unsplit of cfg80211 will set it support command NL80211_CMD_START_SCHED_SCAN because max_sched_scan_reqs is a non zero value, but actually ath10k not support it, then it leads a mismatch result for sched scan of cfg80211, then application shill found the mismatch and stop running case of MAC random address scan and then the case fail. After remove max_sched_scan_reqs value, it keeps match for sched scan and case of MAC random address scan pass. Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00029. Tested with QCA6174 PCIe with firmware WLAN.RM.4.4.1-00110-QCARMSWP-1. Fixes: ce834e280f2f875 ("ath10k: support NET_DETECT WoWLAN feature") Signed-off-by: Wen Gong Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20191114050001.4658-1-wgong@codeaurora.org Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/mac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 2d03b8dd3b8c..7c4ba17a0b68 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -8919,7 +8919,6 @@ int ath10k_mac_register(struct ath10k *ar) ar->hw->wiphy->max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN; if (test_bit(WMI_SERVICE_NLO, ar->wmi.svc_map)) { - ar->hw->wiphy->max_sched_scan_reqs = 1; ar->hw->wiphy->max_sched_scan_ssids = WMI_PNO_MAX_SUPP_NETWORKS; ar->hw->wiphy->max_match_sets = WMI_PNO_MAX_SUPP_NETWORKS; ar->hw->wiphy->max_sched_scan_ie_len = WMI_PNO_MAX_IE_LENGTH; -- 2.25.1