iwlwifi: move to 512 queues

Avoid using the old define since it will enlarge necessary
structs for previous HW.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
index 097cb45..c648cfb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
@@ -85,7 +85,7 @@
 
 static const struct iwl_base_params iwl_a000_base_params = {
        .eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_A000,
-       .num_of_queues = 31,
+       .num_of_queues = 512,
        .shadow_ram_support = true,
        .led_compensation = 57,
        .wd_timeout = IWL_LONG_WD_TIMEOUT,

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 4af1267..a12197e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -170,7 +170,7 @@ struct iwl_base_params {
           apmg_wake_up_wa:1,
           scd_chain_ext_wa:1;
 
-       u8 num_of_queues;       /* def: HW dependent */
+       u16 num_of_queues;      /* def: HW dependent */
 
        u8 max_ll_items;
        u8 led_compensation;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index 626e270..1816368 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -396,6 +396,8 @@ static inline void iwl_free_rxb(struct iwl_rx_cmd_buffer *r)
  * currently supports
  */
 #define IWL_MAX_HW_QUEUES              32
+#define IWL_MAX_TVQM_QUEUES            512
+
 #define IWL_MAX_TID_COUNT      8
 #define IWL_MGMT_TID           15
 #define IWL_FRAME_LIMIT        64

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 204664b..4e74a6b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -788,7 +788,7 @@ struct iwl_mvm {
                u64 on_time_scan;
        } radio_stats, accu_radio_stats;
 
-       u8 hw_queue_to_mac80211[IWL_MAX_HW_QUEUES];
+       u8 hw_queue_to_mac80211[IWL_MAX_TVQM_QUEUES];
 
        struct {
                u8 hw_queue_refcount;

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 30835f0..fd4faaa 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -414,9 +414,9 @@ struct iwl_trans_pcie {
        struct iwl_dma_ptr kw;
 
        struct iwl_txq *txq_memory;
-       struct iwl_txq *txq[IWL_MAX_HW_QUEUES];
-       unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];
-       unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];
+       struct iwl_txq *txq[IWL_MAX_TVQM_QUEUES];
+       unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];
+       unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];
 
        /* PCI bus related data */
        struct pci_dev *pci_dev;