nl80211: support beacon report scanning

[cascardo/linux.git] / drivers / net / wireless / marvell / mwifiex / scan.c

diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index bc5e52c..fdd7491 100644 (file)
--- 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;