diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-10 18:58:00 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:02:17 +0200 |
| commit | 1cdd59ce8dcfa850ebb8ac2ab000a2ea572d1d69 (patch) | |
| tree | 8b29245415dc01b8e21e978665b56a8c603c5f3e | |
| parent | 8d61ffa5e01c5f676431d12caba17db164a48a86 (diff) | |
| download | linux-stable-1cdd59ce8dcfa850ebb8ac2ab000a2ea572d1d69.tar.gz linux-stable-1cdd59ce8dcfa850ebb8ac2ab000a2ea572d1d69.tar.bz2 linux-stable-1cdd59ce8dcfa850ebb8ac2ab000a2ea572d1d69.zip | |
cfg80211: simplify and correct P2P-Device scan check
If the driver for some reason successfully finishes
scanning while in p2p_stop_device(), cfg80211 will
still set it to aborted. Simplify this code using the
new 'notified' value and only mark it aborted in case
the driver didn't notify cfg80211 at all (in which
case we also leak the request to not crash, this is
a driver bug.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/wireless/core.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 5fc642d4071b..afcb9ec70adb 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -204,18 +204,15 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, rdev->opencount--; if (rdev->scan_req && rdev->scan_req->wdev == wdev) { - bool busy = work_busy(&rdev->scan_done_wk); - /* - * If the work isn't pending or running (in which case it would - * be waiting for the lock we hold) the driver didn't properly - * cancel the scan when the interface was removed. In this case - * warn and leak the scan request object to not crash later. + * 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(). */ - WARN_ON(!busy); - - rdev->scan_req->aborted = true; - ___cfg80211_scan_done(rdev, !busy); + if (WARN_ON(!rdev->scan_req->notified)) + rdev->scan_req->aborted = true; + ___cfg80211_scan_done(rdev, !rdev->scan_req->notified); } } |