nl80211: support beacon report scanning

[mirror_ubuntu-bionic-kernel.git] / drivers / net / wireless / rndis_wlan.c

diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 569918c485b454378106eb1a6abc80469a8043c9..603c90470225d92a11a1e8e3b691bfecaf9058e9 100644 (file)
--- 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;
        }