diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:24:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:24:14 -0500 |
| commit | 841577c3d33b8a2bff66d1b506d8198b25900bde (patch) | |
| tree | 444ca28c7b9ed796d3949f019ae97d2c8ed5bd28 /drivers/net/wireless/iwlwifi/mvm/scan.c | |
| parent | e9c653167710e5624c5576ee7d657c6b86878caf (diff) | |
| parent | 63c361f5114d81db789f8f5671c76c228c35b021 (diff) | |
| download | op-kernel-dev-841577c3d33b8a2bff66d1b506d8198b25900bde.zip op-kernel-dev-841577c3d33b8a2bff66d1b506d8198b25900bde.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index a827a13..bf4e773 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -603,6 +603,9 @@ static void iwl_scan_offload_build_ssid(struct cfg80211_sched_scan_request *req, * config match list. */ for (i = 0; i < req->n_match_sets && i < PROBE_OPTION_MAX; i++) { + /* skip empty SSID matchsets */ + if (!req->match_sets[i].ssid.ssid_len) + continue; scan->direct_scan[i].id = WLAN_EID_SSID; scan->direct_scan[i].len = req->match_sets[i].ssid.ssid_len; memcpy(scan->direct_scan[i].ssid, req->match_sets[i].ssid.ssid, |
