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=ham 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 7BEE3C432C0 for ; Fri, 22 Nov 2019 06:06:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48CAA2070A for ; Fri, 22 Nov 2019 06:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402789; bh=u+OorGplPoo4KPqhEBpJTPq5149qy2NJwf/txWg4fFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lQ4To/zax11lHBFJ+Ghbkd1E1GFBJ6sg9NNU7rhmsfeN9BHJCoQZnieZqDbhiQjjK jmtmz9t8/daWmb0nA7u8KVHfqQ6Pz2qxGI0q2FZ0Ea+rSMeBBIje5i+VNem59P7a0R FvucEt8a74L6O+TIHEqkpJdT5ynS1x2C1QLM57ZI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729226AbfKVGG1 (ORCPT ); Fri, 22 Nov 2019 01:06:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:40874 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729656AbfKVGCS (ORCPT ); Fri, 22 Nov 2019 01:02:18 -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 995E72071B; Fri, 22 Nov 2019 06:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402538; bh=u+OorGplPoo4KPqhEBpJTPq5149qy2NJwf/txWg4fFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WXgJjJ3ruAg+ZnWEG4nlZuu2VwZgRarF3io5WInLGNUH1hUQWk2YxUU0eYS5Bwg0n 0JRfy4gVHKwiNnoSjmpKCzfi1Eaw3ryOEKYDNYzj21p3voZW8dPQNWWsIUk9KCjOaL yeE0vTupW9lJEJef2Kjw4nSRoepIH1WcZx/vz14s= 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.9 45/91] ath6kl: Only use match sets when firmware supports it Date: Fri, 22 Nov 2019 01:00:43 -0500 Message-Id: <20191122060129.4239-44-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122060129.4239-1-sashal@kernel.org> References: <20191122060129.4239-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: 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 b7fe0af4cb240..0cce5a2bca161 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -934,7 +934,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