Commit 6a535e91 authored Dec 05, 2018 by Kyle Roeschley Committed by Greg Kroah-Hartman Dec 05, 2019

ath6kl: Only use match sets when firmware supports it



[ Upstream commit fb376a495fbdb886f38cfaf5a3805401b9e46f13 ]

Commit dd45b759 ("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: dd45b759 ("ath6kl: Include match ssid list in scheduled scan")
Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent ceff61ed

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -934,7 +934,7 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar,
	else		else
	ssid_list[i].flag = ANY_SSID_FLAG;		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;		ssid_list[i].flag \|= MATCH_SSID_FLAG;
	}		}