---

yaml --- r: 315195 b: refs/heads/master c: 4f03c1e h: refs/heads/master i: 315193: 12c9889 315191: d2c8f77 v: v3
git-mirror · Jun 29, 2012 · 435bbe9 · 435bbe9
1 parent 562d36a
commit 435bbe9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 870d37fc22f3e40f9f23e06c581c8538fc16a2f0
+refs/heads/master: 4f03c1ed8901a01ad4abcef95c02c007a2d481c2
diff --git a/trunk/net/wireless/chan.c b/trunk/net/wireless/chan.c
@@ -85,6 +85,8 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
 
 	if (!rdev->ops->set_monitor_channel)
 		return -EOPNOTSUPP;
+	if (!cfg80211_has_monitors_only(rdev))
+		return -EBUSY;
 
 	chan = rdev_freq_to_chan(rdev, freq, chantype);
 	if (!chan)