diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
commit | d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b (patch) | |
tree | 55111555c00d21d4857262bd9ca3ee0bc2bcf222 /package/mac80211/patches/405-regd_no_assoc_hints.patch | |
parent | acd03cf8d8c3a047108b7983944b0c8d0228f812 (diff) | |
download | upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.gz upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.bz2 upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.zip |
mac80211: update to 2013-02-22 from trunk + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36470 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.patch | 13 |
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 8a5c2a2e33..938ac42165 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 -@@ -1796,6 +1796,8 @@ void regulatory_hint_11d(struct wiphy *w +@@ -1730,6 +1730,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(®_mutex); + lr = get_last_request(); - if (unlikely(!last_request)) -@@ -2030,6 +2032,8 @@ static void restore_regulatory_settings( +@@ -1926,6 +1928,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); + } |