mac80211: backport latest version from trunk (as of r37265)

[openwrt/svn-archive/archive.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 938ac42165318e45b69dc6746dd21204b6d231f9..5380853df65a56a9aed72a6e4a6c28e76cf08ebe 100644 (file)
--- a/package/mac80211/patches/405-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/405-regd_no_assoc_hints.patch
@@ -1,15 +1,15 @@
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
-@@ -1730,6 +1730,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1696,6 +1696,8 @@ void regulatory_hint_11d(struct wiphy *w
        enum environment_cap env = ENVIRON_ANY;
-       struct regulatory_request *request, *lr;
+       struct regulatory_request *request = NULL, *lr;
  
 +      return;
 +
-       mutex_lock(&reg_mutex);
-       lr = get_last_request();
- 
-@@ -1926,6 +1928,7 @@ static void restore_regulatory_settings(
+       /* IE len must be evenly divisible by 2 */
+       if (country_ie_len & 0x01)
+               return;
+@@ -1890,6 +1892,7 @@ static void restore_regulatory_settings(
  
  void regulatory_hint_disconnect(void)
  {