Return-path: Received: from ebb06.tieto.com ([131.207.168.38]:62843 "EHLO ebb06.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754402Ab2F2Kr1 (ORCPT ); Fri, 29 Jun 2012 06:47:27 -0400 From: Michal Kazior To: CC: , Michal Kazior Subject: [PATCH 08/13] cfg80211: refuse to .set_monitor_channel when non-monitors are present Date: Fri, 29 Jun 2012 12:47:03 +0200 Message-ID: <1340966828-22874-9-git-send-email-michal.kazior@tieto.com> (sfid-20120629_124731_417455_15581380) In-Reply-To: <1340966828-22874-1-git-send-email-michal.kazior@tieto.com> References: <1340966828-22874-1-git-send-email-michal.kazior@tieto.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: Having .set_monitor_channel work with non-monitor interfaces running would make interface combinations accounting ambiguous. Signed-off-by: Michal Kazior --- net/wireless/chan.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 167e7cb..019401b 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) -- 1.7.0.4