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=-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=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 BE5D2C43603 for ; Wed, 4 Dec 2019 18:00:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A6A920862 for ; Wed, 4 Dec 2019 18:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482441; bh=IP5ew8cinng8wN83PXrqL1p/+8xz9WNlKNL1skXB5BE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2JpcQnewdlP4y+6Q6Xynx9rnVqIJdklXp1S1nEJ17f0YEpyp9poaoJz1z2upo1TAC 6FUEjerXwHJ4o2AJfBw/fyzZ/7LX2FAmuZJwpkQ4c8leKoixR1NCFxBznBcbO0tPA8 npfzXniLcBL2CV5xgSkCTyBqzQmqUPLWhhJbRO4w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729016AbfLDSAk (ORCPT ); Wed, 4 Dec 2019 13:00:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:39452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729390AbfLDSAg (ORCPT ); Wed, 4 Dec 2019 13:00:36 -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 2EE5220863; Wed, 4 Dec 2019 18:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482435; bh=IP5ew8cinng8wN83PXrqL1p/+8xz9WNlKNL1skXB5BE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVt1S2lIoXOWpDQ9MKZYk66VyAFyIcPI8X3yysyhxeQBtFERJJ4me3fxzm873yJlV 1g3ov9pbWoESusIsWbrbJevsHjvNwOOodT2djIybIfFLONie1DT0hCnxhUBazIA+MM c6dj9MsKP6qpQthKsk25b9N3CSgEBxQX59J1hSYc= 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.4 46/92] ath6kl: Only use match sets when firmware supports it Date: Wed, 4 Dec 2019 18:49:46 +0100 Message-Id: <20191204174333.263226729@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204174327.215426506@linuxfoundation.org> References: <20191204174327.215426506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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