wlcore: set 5Ghz probe-req template for DFS channels

Even passive scans on DFS channels require us to send probe requests, so
configure the probe-req in this case.

Also use this opportunity to prevent the code from crashing in case no
SSIDs are sent from above. This will likely happen in the DFS case
introduced. Even a passive scan might need the probe request configured
because of DFS channels.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/net/wireless/ti/wl18xx/scan.c b/drivers/net/wireless/ti/wl18xx/scan.c
index daaebad78e1c..1df88d5336f3 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.c
+++ b/drivers/net/wireless/ti/wl18xx/scan.c
@@ -108,27 +108,27 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         if (cmd->active[0]) {
                 u8 band = IEEE80211_BAND_2GHZ;
                 ret = wl12xx_cmd_build_probe_req(wl, wlvif,
-                                                 cmd->role_id, band,
-                                                 req->ssids[0].ssid,
-                                                 req->ssids[0].ssid_len,
-                                                 req->ie,
-                                                 req->ie_len,
-                                                 false);
+                                 cmd->role_id, band,
+                                 req->ssids ? req->ssids[0].ssid : NULL,
+                                 req->ssids ? req->ssids[0].ssid_len : 0,
+                                 req->ie,
+                                 req->ie_len,
+                                 false);
                 if (ret < 0) {
                         wl1271_error("2.4GHz PROBE request template failed");
                         goto out;
                 }
         }
 
-        if (cmd->active[1]) {
+        if (cmd->active[1] || cmd->dfs) {
                 u8 band = IEEE80211_BAND_5GHZ;
                 ret = wl12xx_cmd_build_probe_req(wl, wlvif,
-                                                 cmd->role_id, band,
-                                                 req->ssids[0].ssid,
-                                                 req->ssids[0].ssid_len,
-                                                 req->ie,
-                                                 req->ie_len,
-                                                 false);
+                                 cmd->role_id, band,
+                                 req->ssids ? req->ssids[0].ssid : NULL,
+                                 req->ssids ? req->ssids[0].ssid_len : 0,
+                                 req->ie,
+                                 req->ie_len,
+                                 false);
                 if (ret < 0) {
                         wl1271_error("5GHz PROBE request template failed");
                         goto out;
@@ -230,27 +230,27 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
         if (cmd->active[0]) {
                 u8 band = IEEE80211_BAND_2GHZ;
                 ret = wl12xx_cmd_build_probe_req(wl, wlvif,
-                                                 cmd->role_id, band,
-                                                 req->ssids[0].ssid,
-                                                 req->ssids[0].ssid_len,
-                                                 ies->ie[band],
-                                                 ies->len[band],
-                                                 true);
+                                 cmd->role_id, band,
+                                 req->ssids ? req->ssids[0].ssid : NULL,
+                                 req->ssids ? req->ssids[0].ssid_len : 0,
+                                 ies->ie[band],
+                                 ies->len[band],
+                                 true);
                 if (ret < 0) {
                         wl1271_error("2.4GHz PROBE request template failed");
                         goto out;
                 }
         }
 
-        if (cmd->active[1]) {
+        if (cmd->active[1] || cmd->dfs) {
                 u8 band = IEEE80211_BAND_5GHZ;
                 ret = wl12xx_cmd_build_probe_req(wl, wlvif,
-                                                 cmd->role_id, band,
-                                                 req->ssids[0].ssid,
-                                                 req->ssids[0].ssid_len,
-                                                 ies->ie[band],
-                                                 ies->len[band],
-                                                 true);
+                                 cmd->role_id, band,
+                                 req->ssids ? req->ssids[0].ssid : NULL,
+                                 req->ssids ? req->ssids[0].ssid_len : 0,
+                                 ies->ie[band],
+                                 ies->len[band],
+                                 true);
                 if (ret < 0) {
                         wl1271_error("5GHz PROBE request template failed");
                         goto out;