staging: wilc1000: refactor scan() cfg80211 ops callback

Refactor scan() cfg80211 callback function and use correct value for
valid channel number limit.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 8fa97a7af03ec536c7128ad196ed61f878472151..0feb63fb478e218a8678f87406174ef7c02d4568 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -18,7 +18,7 @@ enum {
 };
 
 #define WILC_MAX_NUM_STA                       9
-#define MAX_NUM_SCANNED_NETWORKS               100
+#define WILC_MAX_NUM_SCANNED_CH                        14
 #define WILC_MAX_NUM_PROBED_SSID               10
 
 #define TX_MIC_KEY_LEN                         8

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index faffcc866b1eaea75dadcf9db1a6abe6cc11e495..08b60ddd9f8d15c10060a2841988fd77066c517c 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -266,42 +266,41 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
        struct wilc_vif *vif = netdev_priv(priv->dev);
        u32 i;
        int ret = 0;
-       u8 scan_ch_list[MAX_NUM_SCANNED_NETWORKS];
+       u8 scan_ch_list[WILC_MAX_NUM_SCANNED_CH];
        struct wilc_probe_ssid probe_ssid;
 
-       priv->scan_req = request;
+       if (request->n_channels > WILC_MAX_NUM_SCANNED_CH) {
+               netdev_err(priv->dev, "Requested scanned channels over\n");
+               return -EINVAL;
+       }
 
+       priv->scan_req = request;
        priv->cfg_scanning = true;
-       if (request->n_channels <= MAX_NUM_SCANNED_NETWORKS) {
-               for (i = 0; i < request->n_channels; i++) {
-                       u16 freq = request->channels[i]->center_freq;
-
-                       scan_ch_list[i] = ieee80211_frequency_to_channel(freq);
-               }
+       for (i = 0; i < request->n_channels; i++) {
+               u16 freq = request->channels[i]->center_freq;
 
-               if (request->n_ssids >= 1) {
-                       if (wilc_wfi_cfg_alloc_fill_ssid(request,
-                                                        &probe_ssid)) {
-                               ret = -ENOMEM;
-                               goto out;
-                       }
+               scan_ch_list[i] = ieee80211_frequency_to_channel(freq);
+       }
 
-                       ret = wilc_scan(vif, WILC_FW_USER_SCAN,
-                                       WILC_FW_ACTIVE_SCAN, scan_ch_list,
-                                       request->n_channels,
-                                       (const u8 *)request->ie,
-                                       request->ie_len, cfg_scan_result,
-                                       (void *)priv, &probe_ssid);
-               } else {
-                       ret = wilc_scan(vif, WILC_FW_USER_SCAN,
-                                       WILC_FW_ACTIVE_SCAN, scan_ch_list,
-                                       request->n_channels,
-                                       (const u8 *)request->ie,
-                                       request->ie_len, cfg_scan_result,
-                                       (void *)priv, NULL);
+       if (request->n_ssids >= 1) {
+               if (wilc_wfi_cfg_alloc_fill_ssid(request, &probe_ssid)) {
+                       ret = -ENOMEM;
+                       goto out;
                }
+
+               ret = wilc_scan(vif, WILC_FW_USER_SCAN,
+                               WILC_FW_ACTIVE_SCAN, scan_ch_list,
+                               request->n_channels,
+                               (const u8 *)request->ie,
+                               request->ie_len, cfg_scan_result,
+                               (void *)priv, &probe_ssid);
        } else {
-               netdev_err(priv->dev, "Requested scanned channels over\n");
+               ret = wilc_scan(vif, WILC_FW_USER_SCAN,
+                               WILC_FW_ACTIVE_SCAN, scan_ch_list,
+                               request->n_channels,
+                               (const u8 *)request->ie,
+                               request->ie_len, cfg_scan_result,
+                               (void *)priv, NULL);
        }
 
 out: