Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Markus Theil <markus.theil@tu-ilmenau.de>
To:     johannes@sipsolutions.net
Cc:     linux-wireless@vger.kernel.org, nbd@nbd.name, lorenzo@kernel.org,
        Markus Theil <markus.theil@tu-ilmenau.de>
Subject: [PATCH 2/3] mac80211: conditionally allow scan in monitor mode
Date:   Tue,  3 Mar 2020 12:50:16 +0100
Message-Id: <20200303115017.9845-2-markus.theil@tu-ilmenau.de>
In-Reply-To: <20200303115017.9845-1-markus.theil@tu-ilmenau.de>
References: <20200303115017.9845-1-markus.theil@tu-ilmenau.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

This patch checks the monitor mode scan feature flag and conditionally
allows scanning in monitor mode for hw which supports this.

Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
---
 net/mac80211/cfg.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 7b654d2b8bb2..01a20f2dbf86 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2313,6 +2313,12 @@ static int ieee80211_scan(struct wiphy *wiphy,
 		     !(req->flags & NL80211_SCAN_FLAG_AP)))
 			return -EOPNOTSUPP;
 		break;
+	case NL80211_IFTYPE_MONITOR:
+		if (wiphy_ext_feature_isset(wiphy,
+					    NL80211_EXT_FEATURE_MONITOR_MODE_SCAN))
+			break;
+		else
+			return -EOPNOTSUPP;
 	case NL80211_IFTYPE_NAN:
 	default:
 		return -EOPNOTSUPP;
-- 
2.25.1