diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
commit | 6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e (patch) | |
tree | e53928d7ac5004a755b1a8455945a93fa17386dc /package/mac80211/patches/310-ap_scan.patch | |
parent | 104526605c12d4e37b9bf2aab92baf3f79addb4c (diff) | |
download | master-187ad058-6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e.tar.gz master-187ad058-6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e.tar.bz2 master-187ad058-6ec11910ca5abfb3d646d15ca11e1c7ed48cfc3e.zip |
mac80211: update to wireless-testing 2012-12-06
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34571 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/310-ap_scan.patch')
-rw-r--r-- | package/mac80211/patches/310-ap_scan.patch | 16 |
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; |