|
@@ -203,17 +203,8 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
|
|
|
|
|
|
rdev->opencount--;
|
|
|
|
|
|
- if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
|
|
|
- /*
|
|
|
- * If the scan request wasn't notified as done, set it
|
|
|
- * to aborted and leak it after a warning. The driver
|
|
|
- * should have notified us that it ended at the latest
|
|
|
- * during rdev_stop_p2p_device().
|
|
|
- */
|
|
|
- if (WARN_ON(!rdev->scan_req->notified))
|
|
|
- rdev->scan_req->aborted = true;
|
|
|
- ___cfg80211_scan_done(rdev, !rdev->scan_req->notified);
|
|
|
- }
|
|
|
+ WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
|
|
|
+ !rdev->scan_req->notified);
|
|
|
}
|
|
|
|
|
|
static int cfg80211_rfkill_set_block(void *data, bool blocked)
|
|
@@ -859,11 +850,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
|
|
|
break;
|
|
|
case NETDEV_DOWN:
|
|
|
cfg80211_update_iface_num(rdev, wdev->iftype, -1);
|
|
|
- if (rdev->scan_req && rdev->scan_req->wdev == wdev) {
|
|
|
- if (WARN_ON(!rdev->scan_req->notified))
|
|
|
- rdev->scan_req->aborted = true;
|
|
|
- ___cfg80211_scan_done(rdev, true);
|
|
|
- }
|
|
|
+ WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev &&
|
|
|
+ !rdev->scan_req->notified);
|
|
|
|
|
|
if (WARN_ON(rdev->sched_scan_req &&
|
|
|
rdev->sched_scan_req->dev == wdev->netdev)) {
|