mac80211: only allocate one queue when using iTXQs

There's no need to allocate than one queue in the iTXQs case
now that we no longer use ndo_select_queue to assign the AC.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6e1b031535d5d3a391f9db6d6964f29c7b288935..94459b2b3d2a4a3a3cee06c11df174e0aa612f45 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1763,13 +1763,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
                        txq_size += sizeof(struct txq_info) +
                                    local->hw.txq_data_size;
 
-               if (local->ops->wake_tx_queue)
+               if (local->ops->wake_tx_queue) {
                        if_setup = ieee80211_if_setup_no_queue;
-               else
+               } else {
                        if_setup = ieee80211_if_setup;
-
-               if (local->hw.queues >= IEEE80211_NUM_ACS)
-                       txqs = IEEE80211_NUM_ACS;
+                       if (local->hw.queues >= IEEE80211_NUM_ACS)
+                               txqs = IEEE80211_NUM_ACS;
+               }
 
                ndev = alloc_netdev_mqs(size + txq_size,
                                        name, name_assign_type,