aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/405-regd_no_assoc_hints.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-09 12:45:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-09 12:45:28 +0000
commit83842c1fc6a87d97c78d7e04125f5727959ef107 (patch)
treef7afffa09343f242197687392735469039f3141b /package/mac80211/patches/405-regd_no_assoc_hints.patch
parente965a05114759541b197b219eabf9fea70ac500a (diff)
downloadmaster-187ad058-83842c1fc6a87d97c78d7e04125f5727959ef107.tar.gz
master-187ad058-83842c1fc6a87d97c78d7e04125f5727959ef107.tar.bz2
master-187ad058-83842c1fc6a87d97c78d7e04125f5727959ef107.zip
mac80211: update to 2013-01-07, add several ath9k stability fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35063 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.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/package/mac80211/patches/405-regd_no_assoc_hints.patch b/package/mac80211/patches/405-regd_no_assoc_hints.patch
index f3fef927ea..170bc31886 100644
--- a/package/mac80211/patches/405-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/405-regd_no_assoc_hints.patch
@@ -1,20 +1,19 @@
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -1805,6 +1805,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1717,6 +1717,8 @@ void regulatory_hint_11d(struct wiphy *w
enum environment_cap env = ENVIRON_ANY;
- struct regulatory_request *request;
+ struct regulatory_request *request, *lr;
+ return;
+
mutex_lock(&reg_mutex);
+ lr = get_last_request();
- if (unlikely(!last_request))
-@@ -2039,6 +2041,8 @@ static void restore_regulatory_settings(
+@@ -1913,6 +1915,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");
+ REG_DBG_PRINT("All devices are disconnected, going to restore regulatory settings\n");
restore_regulatory_settings(false);
+ }