aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-02-01 15:35:36 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-03 16:44:44 -0500
commite9d7732eafe38a717212648b7615399e68abb551 (patch)
tree172abd98d1272c1e89f8062f4bde41f2af211aff /net
parent771bbd09f7febb854dd7c30f983aa57535f9e8c9 (diff)
downloadkernel_samsung_smdk4412-e9d7732eafe38a717212648b7615399e68abb551.zip
kernel_samsung_smdk4412-e9d7732eafe38a717212648b7615399e68abb551.tar.gz
kernel_samsung_smdk4412-e9d7732eafe38a717212648b7615399e68abb551.tar.bz2
mac80211: allow GO to scan like AP
There's no point in disallowing scanning for a GO interface when it's not beaconing yet. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 88b0884..845c76d 100644
--- a/net/mac80211/cfg.c
+++ b/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;