aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/310-ap_scan.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-07 16:46:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-07 16:46:04 +0000
commit6716ba9aadc93b2858ab800a84cb4335c92324ff (patch)
tree8f8fbea06486b2e23eb4be46d92b4b0f121e831c /package/mac80211/patches/310-ap_scan.patch
parent3365e2caf014e24ff8ea091a3d93cb89f330b70b (diff)
downloadupstream-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.gz
upstream-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.bz2
upstream-6716ba9aadc93b2858ab800a84cb4335c92324ff.zip
mac80211: update to wireless-testing 2012-12-06
SVN-Revision: 34571
Diffstat (limited to 'package/mac80211/patches/310-ap_scan.patch')
-rw-r--r--package/mac80211/patches/310-ap_scan.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/patches/310-ap_scan.patch b/package/mac80211/patches/310-ap_scan.patch
index 67a9dcaba8..958c7fd20b 100644
--- a/package/mac80211/patches/310-ap_scan.patch
+++ b/package/mac80211/patches/310-ap_scan.patch
@@ -1,11 +1,11 @@
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -1796,8 +1796,6 @@ static int ieee80211_scan(struct wiphy *
- * beaconing hasn't been configured yet
+@@ -1916,7 +1916,7 @@ static int ieee80211_scan(struct wiphy *
+ * the frames sent while scanning on other channel will be
+ * lost)
*/
- case NL80211_IFTYPE_AP:
-- if (sdata->u.ap.beacon)
-- return -EOPNOTSUPP;
- break;
- default:
- return -EOPNOTSUPP;
+- if (sdata->u.ap.beacon &&
++ if (0 && sdata->u.ap.beacon &&
+ (!(wiphy->features & NL80211_FEATURE_AP_SCAN) ||
+ !(req->flags & NL80211_SCAN_FLAG_AP)))
+ return -EOPNOTSUPP;