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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 C1107C2BC73 for ; Wed, 4 Dec 2019 18:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9818320865 for ; Wed, 4 Dec 2019 18:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483118; bh=u+OorGplPoo4KPqhEBpJTPq5149qy2NJwf/txWg4fFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qBAWfu1TvbkFPDPLErQBmD8b0bdImi6a7COZrkhclCRRGEON8WiyY7v9keV9j16cc MtVPq/IOG61CtfW+glJvr03h1Vd//Kv7dEvCDi+dq0/dKI+9VR3SxZ6lq4J9Ohl/EE m9RuBoj2F80G/rDQBI/mR5wovqhias8AL0sxUGgs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730933AbfLDSL5 (ORCPT ); Wed, 4 Dec 2019 13:11:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:40386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731535AbfLDSL4 (ORCPT ); Wed, 4 Dec 2019 13:11:56 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 862CD20675; Wed, 4 Dec 2019 18:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483116; bh=u+OorGplPoo4KPqhEBpJTPq5149qy2NJwf/txWg4fFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gcCNNOgsncrEyVsLy3QI5E4FWk5qQRPpE2hSr7dnFcH1ZyCdouIzhXe25UmRmYYT8 JYNTkTHPooMM7nYit1a5xCU2ut+GkH6bZEma2jI5MLfXbbSIm3ad/2wunAxf9edp2R GWEKagFSve5Qp5gjRAlE5IP/pkrknm+ncoLD9VH8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kyle Roeschley , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 058/125] ath6kl: Only use match sets when firmware supports it Date: Wed, 4 Dec 2019 18:56:03 +0100 Message-Id: <20191204175322.495760838@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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