ar71xx: merge 3.2 fixes

[openwrt.git] / package / mac80211 / patches / 406-regd_no_assoc_hints.patch

diff --git a/package/mac80211/patches/406-regd_no_assoc_hints.patch b/package/mac80211/patches/406-regd_no_assoc_hints.patch
index 1933683..29da3b2 100644 (file)
--- a/package/mac80211/patches/406-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/406-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
-@@ -1656,6 +1656,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1690,6 +1690,8 @@ void regulatory_hint_11d(struct wiphy *w
        enum environment_cap env = ENVIRON_ANY;
        struct regulatory_request *request;
  
@@ -9,7 +9,7 @@
        mutex_lock(&reg_mutex);
  
        if (unlikely(!last_request))
-@@ -1862,6 +1864,8 @@ static void restore_regulatory_settings(
+@@ -1925,6 +1927,8 @@ static void restore_regulatory_settings(
  
  void regulatory_hint_disconnect(void)
  {