From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D0ABC432C3 for ; Fri, 22 Nov 2019 06:17:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69E3420708 for ; Fri, 22 Nov 2019 06:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403423; bh=IP5ew8cinng8wN83PXrqL1p/+8xz9WNlKNL1skXB5BE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JvuwZqYOEqZhmw7k+AwlP7quGKtjFtb3vOfTrWVyoJqCed+LSqfW3iu7xTtbdzxsT teBc3mvdjU6mncjUaRijqTzo9XgDEu8e/ZFt+uOiN+DJlNXzgzBiiGxJr3nYsBHbkO +gahS95LrAV0hquoNEcJulYvmQDKfL784acW+dgE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729453AbfKVGQr (ORCPT ); Fri, 22 Nov 2019 01:16:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:51144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728428AbfKVGNp (ORCPT ); Fri, 22 Nov 2019 01:13:45 -0500 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 B803520718; Fri, 22 Nov 2019 06:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403224; bh=IP5ew8cinng8wN83PXrqL1p/+8xz9WNlKNL1skXB5BE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zwJPVXH8QDbwEtv/oCUZY3FpTRlPZZHHSpbVxg6IpZjDKYaf44kHP1ClL5Kc8a1VB LWCf3zvRNjQ5l3lEhjDCreJ9bSlPno7SGMC/lYu3J5mM1zOlaRkCcSrSwNA3uJCnM8 hdfKVdU22bzTob4WlGVoDOeejCW6+oulGRMdenp0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kyle Roeschley , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 38/68] ath6kl: Only use match sets when firmware supports it Date: Fri, 22 Nov 2019 01:12:31 -0500 Message-Id: <20191122061301.4947-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122061301.4947-1-sashal@kernel.org> References: <20191122061301.4947-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Kyle Roeschley [ Upstream commit fb376a495fbdb886f38cfaf5a3805401b9e46f13 ] Commit dd45b7598f1c ("ath6kl: Include match ssid list in scheduled scan") merged the probed and matched SSID lists before sending them to the firmware. In the process, it assumed match set support is always available in ath6kl_set_probed_ssids, which breaks scans for hidden SSIDs. Now, check that the firmware supports matching SSIDs in scheduled scans before setting MATCH_SSID_FLAG. Fixes: dd45b7598f1c ("ath6kl: Include match ssid list in scheduled scan") Signed-off-by: Kyle Roeschley Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 81ac8c59f0ecd..2b79815f59093 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -932,7 +932,7 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar, else ssid_list[i].flag = ANY_SSID_FLAG; - if (n_match_ssid == 0) + if (ar->wiphy->max_match_sets != 0 && n_match_ssid == 0) ssid_list[i].flag |= MATCH_SSID_FLAG; } -- 2.20.1