mac80211: update to wireless-testing 2012-12-06

SVN-Revision: 34571
2012-12-07 16:46:04 +00:00
parent 3365e2caf0
commit 6716ba9aad
59 changed files with 579 additions and 2109 deletions
--- 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;