mac80211: merge the upstream ht40 fix

SVN-Revision: 24033

diff --git a/package/mac80211/patches/310-pending_work.patch b/package/mac80211/patches/310-pending_work.patch
index ea02fcbc1c8e795e635364bfa302ad5d9fa3029c..96918888d3e0bc4583452956661c68c26bc92351 100644 (file)
--- a/package/mac80211/patches/310-pending_work.patch
+++ b/package/mac80211/patches/310-pending_work.patch
@@ -290,3 +290,16 @@
        mutex_unlock(&reg_mutex);
  
        return r;
+--- a/net/wireless/chan.c
++++ b/net/wireless/chan.c
+@@ -54,8 +54,10 @@ static bool can_beacon_sec_chan(struct w
+       switch (channel_type) {
+       case NL80211_CHAN_HT40PLUS:
+               diff = 20;
++              break;
+       case NL80211_CHAN_HT40MINUS:
+               diff = -20;
++              break;
+       default:
+               return false;
+       }