lkml.org 
[lkml]   [2019]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 058/125] ath6kl: Only use match sets when firmware supports it
    Date
    From: Kyle Roeschley <kyle.roeschley@ni.com>

    [ 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 <kyle.roeschley@ni.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2019-12-04 19:12    [W:4.149 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site