1 files changed, 110 insertions, 52 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 9c3200bcfc02..1220f5afdb7e 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -567,18 +567,15 @@ void ieee80211_flush_queues(struct ieee80211_local *local,
                                         IEEE80211_QUEUE_STOP_REASON_FLUSH);
 }
 
-void ieee80211_iterate_active_interfaces(
-        struct ieee80211_hw *hw, u32 iter_flags,
-        void (*iterator)(void *data, u8 *mac,
-                         struct ieee80211_vif *vif),
-        void *data)
+static void __iterate_active_interfaces(struct ieee80211_local *local,
+                                        u32 iter_flags,
+                                        void (*iterator)(void *data, u8 *mac,
+                                                struct ieee80211_vif *vif),
+                                        void *data)
 {
-        struct ieee80211_local *local = hw_to_local(hw);
         struct ieee80211_sub_if_data *sdata;
 
-        mutex_lock(&local->iflist_mtx);
-
-        list_for_each_entry(sdata, &local->interfaces, list) {
+        list_for_each_entry_rcu(sdata, &local->interfaces, list) {
                 switch (sdata->vif.type) {
                 case NL80211_IFTYPE_MONITOR:
                         if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
@@ -597,13 +594,25 @@ void ieee80211_iterate_active_interfaces(
                                  &sdata->vif);
         }
 
-        sdata = rcu_dereference_protected(local->monitor_sdata,
-                                          lockdep_is_held(&local->iflist_mtx));
+        sdata = rcu_dereference_check(local->monitor_sdata,
+                                      lockdep_is_held(&local->iflist_mtx) ||
+                                      lockdep_rtnl_is_held());
         if (sdata &&
             (iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL ||
              sdata->flags & IEEE80211_SDATA_IN_DRIVER))
                 iterator(data, sdata->vif.addr, &sdata->vif);
+}
+
+void ieee80211_iterate_active_interfaces(
+        struct ieee80211_hw *hw, u32 iter_flags,
+        void (*iterator)(void *data, u8 *mac,
+                         struct ieee80211_vif *vif),
+        void *data)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
 
+        mutex_lock(&local->iflist_mtx);
+        __iterate_active_interfaces(local, iter_flags, iterator, data);
         mutex_unlock(&local->iflist_mtx);
 }
 EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
@@ -615,38 +624,26 @@ void ieee80211_iterate_active_interfaces_atomic(
         void *data)
 {
         struct ieee80211_local *local = hw_to_local(hw);
-        struct ieee80211_sub_if_data *sdata;
 
         rcu_read_lock();
+        __iterate_active_interfaces(local, iter_flags, iterator, data);
+        rcu_read_unlock();
+}
+EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
 
-        list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-                switch (sdata->vif.type) {
-                case NL80211_IFTYPE_MONITOR:
-                        if (!(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
-                                continue;
-                        break;
-                case NL80211_IFTYPE_AP_VLAN:
-                        continue;
-                default:
-                        break;
-                }
-                if (!(iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL) &&
-                    !(sdata->flags & IEEE80211_SDATA_IN_DRIVER))
-                        continue;
-                if (ieee80211_sdata_running(sdata))
-                        iterator(data, sdata->vif.addr,
-                                 &sdata->vif);
-        }
+void ieee80211_iterate_active_interfaces_rtnl(
+        struct ieee80211_hw *hw, u32 iter_flags,
+        void (*iterator)(void *data, u8 *mac,
+                         struct ieee80211_vif *vif),
+        void *data)
+{
+        struct ieee80211_local *local = hw_to_local(hw);
 
-        sdata = rcu_dereference(local->monitor_sdata);
-        if (sdata &&
-            (iter_flags & IEEE80211_IFACE_ITER_RESUME_ALL ||
-             sdata->flags & IEEE80211_SDATA_IN_DRIVER))
-                iterator(data, sdata->vif.addr, &sdata->vif);
+        ASSERT_RTNL();
 
-        rcu_read_unlock();
+        __iterate_active_interfaces(local, iter_flags, iterator, data);
 }
-EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
+EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_rtnl);
 
 /*
  * Nothing should have been stuffed into the workqueue during
@@ -1007,14 +1004,21 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
          */
         enable_qos = (sdata->vif.type != NL80211_IFTYPE_STATION);
 
-        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
-                /* Set defaults according to 802.11-2007 Table 7-37 */
-                aCWmax = 1023;
-                if (use_11b)
-                        aCWmin = 31;
-                else
-                        aCWmin = 15;
+        /* Set defaults according to 802.11-2007 Table 7-37 */
+        aCWmax = 1023;
+        if (use_11b)
+                aCWmin = 31;
+        else
+                aCWmin = 15;
+
+        /* Confiure old 802.11b/g medium access rules. */
+        qparam.cw_max = aCWmax;
+        qparam.cw_min = aCWmin;
+        qparam.txop = 0;
+        qparam.aifs = 2;
 
+        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
+                /* Update if QoS is enabled. */
                 if (enable_qos) {
                         switch (ac) {
                         case IEEE80211_AC_BK:
@@ -1050,12 +1054,6 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
                                 qparam.aifs = 2;
                                 break;
                         }
-                } else {
-                        /* Confiure old 802.11b/g medium access rules. */
-                        qparam.cw_max = aCWmax;
-                        qparam.cw_min = aCWmin;
-                        qparam.txop = 0;
-                        qparam.aifs = 2;
                 }
 
                 qparam.uapsd = false;
@@ -1084,8 +1082,8 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_mgmt *mgmt;
         int err;
 
-        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
-                            sizeof(*mgmt) + 6 + extra_len);
+        /* 24 + 6 = header + auth_algo + auth_transaction + status_code */
+        skb = dev_alloc_skb(local->hw.extra_tx_headroom + 24 + 6 + extra_len);
         if (!skb)
                 return;
 
@@ -2292,3 +2290,63 @@ void ieee80211_radar_detected(struct ieee80211_hw *hw)
         ieee80211_queue_work(hw, &local->radar_detected_work);
 }
 EXPORT_SYMBOL(ieee80211_radar_detected);
+
+u32 ieee80211_chandef_downgrade(struct cfg80211_chan_def *c)
+{
+        u32 ret;
+        int tmp;
+
+        switch (c->width) {
+        case NL80211_CHAN_WIDTH_20:
+                c->width = NL80211_CHAN_WIDTH_20_NOHT;
+                ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT;
+                break;
+        case NL80211_CHAN_WIDTH_40:
+                c->width = NL80211_CHAN_WIDTH_20;
+                c->center_freq1 = c->chan->center_freq;
+                ret = IEEE80211_STA_DISABLE_40MHZ |
+                      IEEE80211_STA_DISABLE_VHT;
+                break;
+        case NL80211_CHAN_WIDTH_80:
+                tmp = (30 + c->chan->center_freq - c->center_freq1)/20;
+                /* n_P40 */
+                tmp /= 2;
+                /* freq_P40 */
+                c->center_freq1 = c->center_freq1 - 20 + 40 * tmp;
+                c->width = NL80211_CHAN_WIDTH_40;
+                ret = IEEE80211_STA_DISABLE_VHT;
+                break;
+        case NL80211_CHAN_WIDTH_80P80:
+                c->center_freq2 = 0;
+                c->width = NL80211_CHAN_WIDTH_80;
+                ret = IEEE80211_STA_DISABLE_80P80MHZ |
+                      IEEE80211_STA_DISABLE_160MHZ;
+                break;
+        case NL80211_CHAN_WIDTH_160:
+                /* n_P20 */
+                tmp = (70 + c->chan->center_freq - c->center_freq1)/20;
+                /* n_P80 */
+                tmp /= 4;
+                c->center_freq1 = c->center_freq1 - 40 + 80 * tmp;
+                c->width = NL80211_CHAN_WIDTH_80;
+                ret = IEEE80211_STA_DISABLE_80P80MHZ |
+                      IEEE80211_STA_DISABLE_160MHZ;
+                break;
+        default:
+        case NL80211_CHAN_WIDTH_20_NOHT:
+                WARN_ON_ONCE(1);
+                c->width = NL80211_CHAN_WIDTH_20_NOHT;
+                ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT;
+                break;
+        case NL80211_CHAN_WIDTH_5:
+        case NL80211_CHAN_WIDTH_10:
+                WARN_ON_ONCE(1);
+                /* keep c->width */
+                ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT;
+                break;
+        }
+
+        WARN_ON_ONCE(!cfg80211_chandef_valid(c));
+
+        return ret;
+}