projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2013-02-22
[openwrt/staging/mkresin.git]
/
package
/
mac80211
/
patches
/
405-regd_no_assoc_hints.patch
diff --git
a/package/mac80211/patches/405-regd_no_assoc_hints.patch
b/package/mac80211/patches/405-regd_no_assoc_hints.patch
index 8a5c2a2e33cc9e1b8a3b06356190cd102d45051b..938ac42165318e45b69dc6746dd21204b6d231f9 100644
(file)
--- 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
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -17
96,6 +1796
,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -17
30,6 +1730
,8 @@ void regulatory_hint_11d(struct wiphy *w
enum environment_cap env = ENVIRON_ANY;
enum environment_cap env = ENVIRON_ANY;
- struct regulatory_request *request;
+ struct regulatory_request *request
, *lr
;
+ return;
+
mutex_lock(®_mutex);
+ 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;
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);
restore_regulatory_settings(false);
+ }