aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-15 15:03:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-15 15:03:48 +0000
commit2144c554b6ee2947d80fdcccb33a00cff546bfad (patch)
tree168dea1f65d824655dd4abbd01cfa313beb7acfa /package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
parent542fff321054ef287af1221cff1595bd3125b16a (diff)
downloadmaster-187ad058-2144c554b6ee2947d80fdcccb33a00cff546bfad.tar.gz
master-187ad058-2144c554b6ee2947d80fdcccb33a00cff546bfad.tar.bz2
master-187ad058-2144c554b6ee2947d80fdcccb33a00cff546bfad.zip
mac80211: update to wireless-testing 2016-01-10
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch')
-rw-r--r--package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch b/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
index 30af48a7e5..1ef55456c5 100644
--- a/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
+++ b/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -2463,6 +2463,8 @@ void regulatory_hint_country_ie(struct w
+@@ -2411,6 +2411,8 @@ void regulatory_hint_country_ie(struct w
enum environment_cap env = ENVIRON_ANY;
struct regulatory_request *request = NULL, *lr;
@@ -9,11 +9,11 @@
/* IE len must be evenly divisible by 2 */
if (country_ie_len & 0x01)
return;
-@@ -2669,6 +2671,7 @@ static void restore_regulatory_settings(
+@@ -2617,6 +2619,7 @@ static void restore_regulatory_settings(
void regulatory_hint_disconnect(void)
{
+ return;
- REG_DBG_PRINT("All devices are disconnected, going to restore regulatory settings\n");
+ pr_debug("All devices are disconnected, going to restore regulatory settings\n");
restore_regulatory_settings(false);
}