From 34237c18e02a5605f810f53f6b93b607c5d58c07 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 1 Feb 2011 15:35:36 +0100
Subject: [PATCH] --- yaml --- r: 237018 b: refs/heads/master c:
 e9d7732eafe38a717212648b7615399e68abb551 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e47a5b1f8c92..edbfc7bb5602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 771bbd09f7febb854dd7c30f983aa57535f9e8c9
+refs/heads/master: e9d7732eafe38a717212648b7615399e68abb551
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 88b0884ebe6a..845c76d58d25 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1287,8 +1287,11 @@ static int ieee80211_scan(struct wiphy *wiphy,
 	case NL80211_IFTYPE_P2P_GO:
 		if (sdata->local->ops->hw_scan)
 			break;
-		/* FIXME: implement NoA while scanning in software */
-		return -EOPNOTSUPP;
+		/*
+		 * FIXME: implement NoA while scanning in software,
+		 * for now fall through to allow scanning only when
+		 * beaconing hasn't been configured yet
+		 */
 	case NL80211_IFTYPE_AP:
 		if (sdata->u.ap.beacon)
 			return -EOPNOTSUPP;