aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/405-regd_no_assoc_hints.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-06-15 20:14:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-06-15 20:14:06 +0000
commit5fb5b75668de4905edba27be4f503316e298b2e4 (patch)
tree1412b60e597f5cd3c927166f71c0bd3860e2a766 /package/mac80211/patches/405-regd_no_assoc_hints.patch
parented11b6185b5c087dc4acabf1a43c6b82698169d1 (diff)
downloadmaster-187ad058-5fb5b75668de4905edba27be4f503316e298b2e4.tar.gz
master-187ad058-5fb5b75668de4905edba27be4f503316e298b2e4.tar.bz2
master-187ad058-5fb5b75668de4905edba27be4f503316e298b2e4.zip
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36939 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/405-regd_no_assoc_hints.patch')
-rw-r--r--package/mac80211/patches/405-regd_no_assoc_hints.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/405-regd_no_assoc_hints.patch b/package/mac80211/patches/405-regd_no_assoc_hints.patch
index 938ac42165..5380853df6 100644
--- a/package/mac80211/patches/405-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/405-regd_no_assoc_hints.patch
@@ -1,15 +1,15 @@
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -1730,6 +1730,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1696,6 +1696,8 @@ void regulatory_hint_11d(struct wiphy *w
enum environment_cap env = ENVIRON_ANY;
- struct regulatory_request *request, *lr;
+ struct regulatory_request *request = NULL, *lr;
+ return;
+
- mutex_lock(&reg_mutex);
- lr = get_last_request();
-
-@@ -1926,6 +1928,7 @@ static void restore_regulatory_settings(
+ /* IE len must be evenly divisible by 2 */
+ if (country_ie_len & 0x01)
+ return;
+@@ -1890,6 +1892,7 @@ static void restore_regulatory_settings(
void regulatory_hint_disconnect(void)
{