diff options
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 756284e0bbd3..a6f1d8a869bc 100644 --- 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, | |||
774 | setup_timer(&local->dynamic_ps_timer, | 774 | setup_timer(&local->dynamic_ps_timer, |
775 | ieee80211_dynamic_ps_timer, (unsigned long) local); | 775 | ieee80211_dynamic_ps_timer, (unsigned long) local); |
776 | 776 | ||
777 | for (i = 0; i < IEEE80211_MAX_AMPDU_QUEUES; i++) | ||
778 | local->ampdu_ac_queue[i] = -1; | ||
779 | /* using an s8 won't work with more than that */ | ||
780 | BUILD_BUG_ON(IEEE80211_MAX_AMPDU_QUEUES > 127); | ||
781 | |||
782 | sta_info_init(local); | 777 | sta_info_init(local); |
783 | 778 | ||
784 | for (i = 0; i < IEEE80211_MAX_QUEUES; i++) | 779 | for (i = 0; i < IEEE80211_MAX_QUEUES; i++) |
@@ -874,10 +869,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
874 | */ | 869 | */ |
875 | if (hw->queues > IEEE80211_MAX_QUEUES) | 870 | if (hw->queues > IEEE80211_MAX_QUEUES) |
876 | hw->queues = IEEE80211_MAX_QUEUES; | 871 | hw->queues = IEEE80211_MAX_QUEUES; |
877 | if (hw->ampdu_queues > IEEE80211_MAX_AMPDU_QUEUES) | ||
878 | hw->ampdu_queues = IEEE80211_MAX_AMPDU_QUEUES; | ||
879 | if (hw->queues < 4) | ||
880 | hw->ampdu_queues = 0; | ||
881 | 872 | ||
882 | mdev = alloc_netdev_mq(sizeof(struct ieee80211_master_priv), | 873 | mdev = alloc_netdev_mq(sizeof(struct ieee80211_master_priv), |
883 | "wmaster%d", ieee80211_master_setup, | 874 | "wmaster%d", ieee80211_master_setup, |