diff options
| author | Kyle Roeschley <kyle.roeschley@ni.com> | 2018-12-05 08:43:11 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-12-20 08:30:29 +0100 |
| commit | fb376a495fbdb886f38cfaf5a3805401b9e46f13 (patch) | |
| tree | 6a04c6d38c8af8a42a6ed78af1e602457c11f61c /drivers/net/wireless/ath/ath6kl | |
| parent | net: marvell: convert to DEFINE_SHOW_ATTRIBUTE (diff) | |
| download | linux-fb376a495fbdb886f38cfaf5a3805401b9e46f13.tar.xz linux-fb376a495fbdb886f38cfaf5a3805401b9e46f13.zip | |
ath6kl: Only use match sets when firmware supports it
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 <kyle.roeschley@ni.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index e121187f371f..6c98d7903ffb 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -939,7 +939,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; } |