ath9k: merge a pending aggregation fix

[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 91b0c33..1933683 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
-@@ -1629,6 +1629,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1656,6 +1656,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))
-@@ -1791,6 +1793,8 @@ static void restore_regulatory_settings(
+@@ -1862,6 +1864,8 @@ static void restore_regulatory_settings(
  
  void regulatory_hint_disconnect(void)
  {
@@ -18,12 +18,3 @@
        REG_DBG_PRINT("All devices are disconnected, going to "
                      "restore regulatory settings\n");
        restore_regulatory_settings(false);
-@@ -1811,6 +1815,8 @@ int regulatory_hint_found_beacon(struct 
- {
-       struct reg_beacon *reg_beacon;
- 
-+      return;
-+
-       if (likely((beacon_chan->beacon_found ||
-           (beacon_chan->flags & IEEE80211_CHAN_RADAR) ||
-           (beacon_chan->band == IEEE80211_BAND_2GHZ &&