From: Michal Kazior <michal.kazior@tieto.com>
Date: Fri, 29 Jun 2012 10:47:03 +0000 (+0200)
Subject: cfg80211: refuse to .set_monitor_channel when non-monitors are present
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f03c1ed8901a01ad4abcef95c02c007a2d481c2;p=linux-beck.git

cfg80211: refuse to .set_monitor_channel when non-monitors are present

Having .set_monitor_channel work with non-monitor
interfaces running would make interface
combinations accounting ambiguous.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 167e7cb60089..019401b0b5e3 100644
--- a/net/wireless/chan.c
+++ b/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)