---

yaml --- r: 256381 b: refs/heads/master c: 1a84ff7 h: refs/heads/master i: 256379: 0006f0d v: v3
git-mirror · Jul 8, 2011 · 7705235 · 7705235
1 parent 2201257
commit 7705235
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 331c5ea2d92c76bfe58a9bb5e6d21160850a29bc
+refs/heads/master: 1a84ff7564ae43dd1ea20e17f867de2700ca5b5b
diff --git a/trunk/include/linux/nl80211.h b/trunk/include/linux/nl80211.h
@@ -247,7 +247,8 @@
  *	passed, all channels allowed for the current regulatory domain
  *	are used.  Extra IEs can also be passed from the userspace by
  *	using the %NL80211_ATTR_IE attribute.
- * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan
+ * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan.  Returns -ENOENT
+ *	if scheduled scan is not running.
  * @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
  *	results available.
  * @NL80211_CMD_SCHED_SCAN_STOPPED: indicates that the scheduled scan has

diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c
@@ -137,7 +137,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
 	ASSERT_RDEV_LOCK(rdev);
 
 	if (!rdev->sched_scan_req)
-		return 0;
+		return -ENOENT;
 
 	dev = rdev->sched_scan_req->dev;