diff options
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 10 |
1 files changed, 8 insertions, 2 deletions
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) | |||
2134 | struct rndis_wlan_private *priv = | 2134 | struct rndis_wlan_private *priv = |
2135 | container_of(work, struct rndis_wlan_private, scan_work.work); | 2135 | container_of(work, struct rndis_wlan_private, scan_work.work); |
2136 | struct usbnet *usbdev = priv->usbdev; | 2136 | struct usbnet *usbdev = priv->usbdev; |
2137 | struct cfg80211_scan_info info = {}; | ||
2137 | int ret; | 2138 | int ret; |
2138 | 2139 | ||
2139 | netdev_dbg(usbdev->net, "get_scan_results\n"); | 2140 | netdev_dbg(usbdev->net, "get_scan_results\n"); |
@@ -2143,7 +2144,8 @@ static void rndis_get_scan_results(struct work_struct *work) | |||
2143 | 2144 | ||
2144 | ret = rndis_check_bssid_list(usbdev, NULL, NULL); | 2145 | ret = rndis_check_bssid_list(usbdev, NULL, NULL); |
2145 | 2146 | ||
2146 | cfg80211_scan_done(priv->scan_request, ret < 0); | 2147 | info.aborted = ret < 0; |
2148 | cfg80211_scan_done(priv->scan_request, &info); | ||
2147 | 2149 | ||
2148 | priv->scan_request = NULL; | 2150 | priv->scan_request = NULL; |
2149 | } | 2151 | } |
@@ -3574,7 +3576,11 @@ static int rndis_wlan_stop(struct usbnet *usbdev) | |||
3574 | flush_workqueue(priv->workqueue); | 3576 | flush_workqueue(priv->workqueue); |
3575 | 3577 | ||
3576 | if (priv->scan_request) { | 3578 | if (priv->scan_request) { |
3577 | cfg80211_scan_done(priv->scan_request, true); | 3579 | struct cfg80211_scan_info info = { |
3580 | .aborted = true, | ||
3581 | }; | ||
3582 | |||
3583 | cfg80211_scan_done(priv->scan_request, &info); | ||
3578 | priv->scan_request = NULL; | 3584 | priv->scan_request = NULL; |
3579 | } | 3585 | } |
3580 | 3586 | ||