15 files changed, 117 insertions, 29 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 4e11ba06f089..ef5b40ef6d67 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -859,7 +859,11 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,
         struct ath6kl *ar = vif->ar;
 
         if (vif->scan_req) {
-                cfg80211_scan_done(vif->scan_req, true);
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
+                cfg80211_scan_done(vif->scan_req, &info);
                 vif->scan_req = NULL;
         }
 
@@ -1069,6 +1073,9 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy,
 void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted)
 {
         struct ath6kl *ar = vif->ar;
+        struct cfg80211_scan_info info = {
+                .aborted = aborted,
+        };
         int i;
 
         ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: status%s\n", __func__,
@@ -1089,7 +1096,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted)
         }
 
 out:
-        cfg80211_scan_done(vif->scan_req, aborted);
+        cfg80211_scan_done(vif->scan_req, &info);
         vif->scan_req = NULL;
 }
 
@@ -3614,7 +3621,11 @@ void ath6kl_cfg80211_vif_stop(struct ath6kl_vif *vif, bool wmi_ready)
         }
 
         if (vif->scan_req) {
-                cfg80211_scan_done(vif->scan_req, true);
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
+                cfg80211_scan_done(vif->scan_req, &info);
                 vif->scan_req = NULL;
         }
 
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 62bf9331bd7f..f0e1175fb76a 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -1369,7 +1369,11 @@ static void wil_cfg80211_stop_p2p_device(struct wiphy *wiphy,
         mutex_lock(&wil->mutex);
         started = wil_p2p_stop_discovery(wil);
         if (started && wil->scan_request) {
-                cfg80211_scan_done(wil->scan_request, 1);
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
+                cfg80211_scan_done(wil->scan_request, &info);
                 wil->scan_request = NULL;
                 wil->radio_wdev = wil->wdev;
         }
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 8e31d755bbee..4bc92e54984a 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -850,10 +850,14 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
         mutex_unlock(&wil->wmi_mutex);
 
         if (wil->scan_request) {
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
                 wil_dbg_misc(wil, "Abort scan_request 0x%p\n",
                              wil->scan_request);
                 del_timer_sync(&wil->scan_timer);
-                cfg80211_scan_done(wil->scan_request, true);
+                cfg80211_scan_done(wil->scan_request, &info);
                 wil->scan_request = NULL;
         }
 
@@ -1049,10 +1053,14 @@ int __wil_down(struct wil6210_priv *wil)
         (void)wil_p2p_stop_discovery(wil);
 
         if (wil->scan_request) {
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
                 wil_dbg_misc(wil, "Abort scan_request 0x%p\n",
                              wil->scan_request);
                 del_timer_sync(&wil->scan_timer);
-                cfg80211_scan_done(wil->scan_request, true);
+                cfg80211_scan_done(wil->scan_request, &info);
                 wil->scan_request = NULL;
         }
 
diff --git a/drivers/net/wireless/ath/wil6210/p2p.c b/drivers/net/wireless/ath/wil6210/p2p.c
index 213b8259638c..e0f8aa0ebfac 100644
--- a/drivers/net/wireless/ath/wil6210/p2p.c
+++ b/drivers/net/wireless/ath/wil6210/p2p.c
@@ -252,8 +252,12 @@ void wil_p2p_search_expired(struct work_struct *work)
         mutex_unlock(&wil->mutex);
 
         if (started) {
+                struct cfg80211_scan_info info = {
+                        .aborted = false,
+                };
+
                 mutex_lock(&wil->p2p_wdev_mutex);
-                cfg80211_scan_done(wil->scan_request, 0);
+                cfg80211_scan_done(wil->scan_request, &info);
                 wil->scan_request = NULL;
                 wil->radio_wdev = wil->wdev;
                 mutex_unlock(&wil->p2p_wdev_mutex);
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index b80c5d850e1e..4d92541913c0 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -426,15 +426,17 @@ static void wmi_evt_scan_complete(struct wil6210_priv *wil, int id,
 {
         if (wil->scan_request) {
                 struct wmi_scan_complete_event *data = d;
-                bool aborted = (data->status != WMI_SCAN_SUCCESS);
+                struct cfg80211_scan_info info = {
+                        .aborted = (data->status != WMI_SCAN_SUCCESS),
+                };
 
                 wil_dbg_wmi(wil, "SCAN_COMPLETE(0x%08x)\n", data->status);
                 wil_dbg_misc(wil, "Complete scan_request 0x%p aborted %d\n",
-                             wil->scan_request, aborted);
+                             wil->scan_request, info.aborted);
 
                 del_timer_sync(&wil->scan_timer);
                 mutex_lock(&wil->p2p_wdev_mutex);
-                cfg80211_scan_done(wil->scan_request, aborted);
+                cfg80211_scan_done(wil->scan_request, &info);
                 wil->radio_wdev = wil->wdev;
                 mutex_unlock(&wil->p2p_wdev_mutex);
                 wil->scan_request = NULL;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 264bd638a3d9..afe2b202040a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -775,9 +775,13 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
                 if (!aborted)
                         cfg80211_sched_scan_results(cfg_to_wiphy(cfg));
         } else if (scan_request) {
+                struct cfg80211_scan_info info = {
+                        .aborted = aborted,
+                };
+
                 brcmf_dbg(SCAN, "ESCAN Completed scan: %s\n",
                           aborted ? "Aborted" : "Done");
-                cfg80211_scan_done(scan_request, aborted);
+                cfg80211_scan_done(scan_request, &info);
         }
         if (!test_and_clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status))
                 brcmf_dbg(SCAN, "Scan complete, probably P2P scan\n");
diff --git a/drivers/net/wireless/intersil/orinoco/scan.c b/drivers/net/wireless/intersil/orinoco/scan.c
index d0ceb06c72d0..6d1d084854fb 100644
--- a/drivers/net/wireless/intersil/orinoco/scan.c
+++ b/drivers/net/wireless/intersil/orinoco/scan.c
@@ -237,7 +237,11 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv,
 
  scan_abort:
         if (priv->scan_request) {
-                cfg80211_scan_done(priv->scan_request, abort);
+                struct cfg80211_scan_info info = {
+                        .aborted = abort,
+                };
+
+                cfg80211_scan_done(priv->scan_request, &info);
                 priv->scan_request = NULL;
         }
 }
@@ -245,7 +249,11 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv,
 void orinoco_scan_done(struct orinoco_private *priv, bool abort)
 {
         if (priv->scan_request) {
-                cfg80211_scan_done(priv->scan_request, abort);
+                struct cfg80211_scan_info info = {
+                        .aborted = abort,
+                };
+
+                cfg80211_scan_done(priv->scan_request, &info);
                 priv->scan_request = NULL;
         }
 }
diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c
index 776b44bfd93a..ea4802446618 100644
--- a/drivers/net/wireless/marvell/libertas/cfg.c
+++ b/drivers/net/wireless/marvell/libertas/cfg.c
@@ -796,10 +796,15 @@ void lbs_scan_done(struct lbs_private *priv)
 {
         WARN_ON(!priv->scan_req);
 
-        if (priv->internal_scan)
+        if (priv->internal_scan) {
                 kfree(priv->scan_req);
-        else
-                cfg80211_scan_done(priv->scan_req, false);
+        } else {
+                struct cfg80211_scan_info info = {
+                        .aborted = false,
+                };
+
+                cfg80211_scan_done(priv->scan_req, &info);
+        }
 
         priv->scan_req = NULL;
 }
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 6bc2011d8609..e7a21443647e 100644
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -1057,8 +1057,12 @@ mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter)
                         if (!priv)
                                 continue;
                         if (priv->scan_request) {
+                                struct cfg80211_scan_info info = {
+                                        .aborted = true,
+                                };
+
                                 mwifiex_dbg(adapter, WARN, "info: aborting scan\n");
-                                cfg80211_scan_done(priv->scan_request, 1);
+                                cfg80211_scan_done(priv->scan_request, &info);
                                 priv->scan_request = NULL;
                         }
                 }
@@ -1112,8 +1116,12 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
                         if (!priv)
                                 continue;
                         if (priv->scan_request) {
+                                struct cfg80211_scan_info info = {
+                                        .aborted = true,
+                                };
+
                                 mwifiex_dbg(adapter, WARN, "info: aborting scan\n");
-                                cfg80211_scan_done(priv->scan_request, 1);
+                                cfg80211_scan_done(priv->scan_request, &info);
                                 priv->scan_request = NULL;
                         }
                 }
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 0e280f879b58..db4925db39aa 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -697,9 +697,13 @@ mwifiex_close(struct net_device *dev)
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
         if (priv->scan_request) {
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
                 mwifiex_dbg(priv->adapter, INFO,
                             "aborting scan on ndo_stop\n");
-                cfg80211_scan_done(priv->scan_request, 1);
+                cfg80211_scan_done(priv->scan_request, &info);
                 priv->scan_request = NULL;
                 priv->scan_aborting = true;
         }
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index bc5e52cebce1..fdd749110fcb 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -1956,9 +1956,13 @@ static void mwifiex_check_next_scan_command(struct mwifiex_private *priv)
                         mwifiex_complete_scan(priv);
 
                 if (priv->scan_request) {
+                        struct cfg80211_scan_info info = {
+                                .aborted = false,
+                        };
+
                         mwifiex_dbg(adapter, INFO,
                                     "info: notifying scan done\n");
-                        cfg80211_scan_done(priv->scan_request, 0);
+                        cfg80211_scan_done(priv->scan_request, &info);
                         priv->scan_request = NULL;
                 } else {
                         priv->scan_aborting = false;
@@ -1977,9 +1981,13 @@ static void mwifiex_check_next_scan_command(struct mwifiex_private *priv)
 
                 if (!adapter->active_scan_triggered) {
                         if (priv->scan_request) {
+                                struct cfg80211_scan_info info = {
+                                        .aborted = true,
+                                };
+
                                 mwifiex_dbg(adapter, INFO,
                                             "info: aborting scan\n");
-                                cfg80211_scan_done(priv->scan_request, 1);
+                                cfg80211_scan_done(priv->scan_request, &info);
                                 priv->scan_request = NULL;
                         } else {
                                 priv->scan_aborting = false;
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 569918c485b4..603c90470225 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2134,6 +2134,7 @@ static void rndis_get_scan_results(struct work_struct *work)
         struct rndis_wlan_private *priv =
                 container_of(work, struct rndis_wlan_private, scan_work.work);
         struct usbnet *usbdev = priv->usbdev;
+        struct cfg80211_scan_info info = {};
         int ret;
 
         netdev_dbg(usbdev->net, "get_scan_results\n");
@@ -2143,7 +2144,8 @@ static void rndis_get_scan_results(struct work_struct *work)
 
         ret = rndis_check_bssid_list(usbdev, NULL, NULL);
 
-        cfg80211_scan_done(priv->scan_request, ret < 0);
+        info.aborted = ret < 0;
+        cfg80211_scan_done(priv->scan_request, &info);
 
         priv->scan_request = NULL;
 }
@@ -3574,7 +3576,11 @@ static int rndis_wlan_stop(struct usbnet *usbdev)
         flush_workqueue(priv->workqueue);
 
         if (priv->scan_request) {
-                cfg80211_scan_done(priv->scan_request, true);
+                struct cfg80211_scan_info info = {
+                        .aborted = true,
+                };
+
+                cfg80211_scan_done(priv->scan_request, &info);
                 priv->scan_request = NULL;
         }
 
diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 0da559d929bc..d0ba3778990e 100644
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -1256,10 +1256,15 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv,
                 DBG_8723A("%s with scan req\n", __func__);
 
                 if (pwdev_priv->scan_request->wiphy !=
-                    pwdev_priv->rtw_wdev->wiphy)
+                    pwdev_priv->rtw_wdev->wiphy) {
                         DBG_8723A("error wiphy compare\n");
-                else
-                        cfg80211_scan_done(pwdev_priv->scan_request, aborted);
+                } else {
+                        struct cfg80211_scan_info info = {
+                                .aborted = aborted,
+                        };
+
+                        cfg80211_scan_done(pwdev_priv->scan_request, &info);
+                }
 
                 pwdev_priv->scan_request = NULL;
         } else {
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 51aff4ff7d7c..a0d8e22e575b 100644
--- 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;
                         }
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index a6e6fb9f42e1..f46dfe6b24e8 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -338,6 +338,8 @@ static int prism2_scan(struct wiphy *wiphy,
         struct p80211msg_dot11req_scan msg1;
         struct p80211msg_dot11req_scan_results msg2;
         struct cfg80211_bss *bss;
+        struct cfg80211_scan_info info = {};
+
         int result;
         int err = 0;
         int numbss = 0;
@@ -440,7 +442,8 @@ static int prism2_scan(struct wiphy *wiphy,
                 err = prism2_result2err(msg2.resultcode.data);
 
 exit:
-        cfg80211_scan_done(request, err ? 1 : 0);
+        info.aborted = !!(err);
+        cfg80211_scan_done(request, &info);
         priv->scan_request = NULL;
         return err;
 }