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 fc7ccc6b2b9affbb104e937c29a121a205dd1044..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
-@@ -1698,6 +1698,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(&reg_mutex);
+       lr = get_last_request();
  
-       if (unlikely(!last_request))
-@@ -1933,6 +1935,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);
+ }