mac80211: merge upstream fixes

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39442
2014-02-01 15:33:04 +00:00
parent 8fa06b7e3c
commit b9a605b8bf
4 changed files with 881 additions and 20 deletions
--- a/package/kernel/mac80211/patches/310-ap_scan.patch
+++ b/package/kernel/mac80211/patches/310-ap_scan.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -2142,7 +2142,7 @@ static int ieee80211_scan(struct wiphy *
+@@ -2145,7 +2145,7 @@ static int ieee80211_scan(struct wiphy *
 		 * the  frames sent while scanning on other channel will be
 		 * lost)
 		 */