Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / drivers / staging / wilc1000 / wilc_wfi_cfgoperations.c

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3ddfa4a..9092600 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -454,7 +454,11 @@ static void CfgScanResult(enum scan_event scan_event,
                        mutex_lock(&priv->scan_req_lock);
 
                        if (priv->pstrScanReq) {
-                               cfg80211_scan_done(priv->pstrScanReq, false);
+                               struct cfg80211_scan_info info = {
+                                       .aborted = false,
+                               };
+
+                               cfg80211_scan_done(priv->pstrScanReq, &info);
                                priv->u32RcvdChCount = 0;
                                priv->bCfgScanning = false;
                                priv->pstrScanReq = NULL;
@@ -464,10 +468,14 @@ static void CfgScanResult(enum scan_event scan_event,
                        mutex_lock(&priv->scan_req_lock);
 
                        if (priv->pstrScanReq) {
+                               struct cfg80211_scan_info info = {
+                                       .aborted = false,
+                               };
+
                                update_scan_time();
                                refresh_scan(priv, 1, false);
 
-                               cfg80211_scan_done(priv->pstrScanReq, false);
+                               cfg80211_scan_done(priv->pstrScanReq, &info);
                                priv->bCfgScanning = false;
                                priv->pstrScanReq = NULL;
                        }