7 files changed, 52 insertions, 16 deletions

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index d4b7a168f7c0..ebc12c521fe0 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3858,12 +3858,16 @@ void __ath10k_scan_finish(struct ath10k *ar)
                 break;
         case ATH10K_SCAN_RUNNING:
         case ATH10K_SCAN_ABORTING:
-                if (!ar->scan.is_roc)
-                        ieee80211_scan_completed(ar->hw,
-                                                 (ar->scan.state ==
-                                                  ATH10K_SCAN_ABORTING));
-                else if (ar->scan.roc_notify)
+                if (!ar->scan.is_roc) {
+                        struct cfg80211_scan_info info = {
+                                .aborted = (ar->scan.state ==
+                                            ATH10K_SCAN_ABORTING),
+                        };
+
+                        ieee80211_scan_completed(ar->hw, &info);
+                } else if (ar->scan.roc_notify) {
                         ieee80211_remain_on_channel_expired(ar->hw);
+                }
                 /* fall through */
         case ATH10K_SCAN_STARTING:
                 ar->scan.state = ATH10K_SCAN_IDLE;
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/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index e56bafcf5864..57e26a640477 100644
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -960,6 +960,9 @@ void ath_roc_complete(struct ath_softc *sc, enum ath_roc_complete_reason reason)
 void ath_scan_complete(struct ath_softc *sc, bool abort)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct cfg80211_scan_info info = {
+                .aborted = abort,
+        };
 
         if (abort)
                 ath_dbg(common, CHAN_CTX, "HW scan aborted\n");
@@ -969,7 +972,7 @@ void ath_scan_complete(struct ath_softc *sc, bool abort)
         sc->offchannel.scan_req = NULL;
         sc->offchannel.scan_vif = NULL;
         sc->offchannel.state = ATH_OFFCHANNEL_IDLE;
-        ieee80211_scan_completed(sc->hw, abort);
+        ieee80211_scan_completed(sc->hw, &info);
         clear_bit(ATH_OP_SCANNING, &common->op_flags);
         spin_lock_bh(&sc->chan_lock);
         if (test_bit(ATH_OP_MULTI_CHANNEL, &common->op_flags))
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;