mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi

[linux-2.6-omap-h63xx.git] / net / mac80211 / main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 756284e0bbd3f9bbae9f0e509ab52e9fc5067be9..a6f1d8a869bcca64a9abe1824182f10eeaf26cf8 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -774,11 +774,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
        setup_timer(&local->dynamic_ps_timer,
                    ieee80211_dynamic_ps_timer, (unsigned long) local);
 
-       for (i = 0; i < IEEE80211_MAX_AMPDU_QUEUES; i++)
-               local->ampdu_ac_queue[i] = -1;
-       /* using an s8 won't work with more than that */
-       BUILD_BUG_ON(IEEE80211_MAX_AMPDU_QUEUES > 127);
-
        sta_info_init(local);
 
        for (i = 0; i < IEEE80211_MAX_QUEUES; i++)
@@ -874,10 +869,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         */
        if (hw->queues > IEEE80211_MAX_QUEUES)
                hw->queues = IEEE80211_MAX_QUEUES;
-       if (hw->ampdu_queues > IEEE80211_MAX_AMPDU_QUEUES)
-               hw->ampdu_queues = IEEE80211_MAX_AMPDU_QUEUES;
-       if (hw->queues < 4)
-               hw->ampdu_queues = 0;
 
        mdev = alloc_netdev_mq(sizeof(struct ieee80211_master_priv),
                               "wmaster%d", ieee80211_master_setup,