diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 1f42e90c5f30..2f871f0c5d36 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -135,9 +135,10 @@ struct iwl_tx_queue { | |||
135 | struct iwl_tfd *tfds; | 135 | struct iwl_tfd *tfds; |
136 | struct iwl_cmd *cmd[TFD_TX_CMD_SLOTS]; | 136 | struct iwl_cmd *cmd[TFD_TX_CMD_SLOTS]; |
137 | struct iwl_tx_info *txb; | 137 | struct iwl_tx_info *txb; |
138 | int need_update; | 138 | u8 need_update; |
139 | int sched_retry; | 139 | u8 sched_retry; |
140 | int active; | 140 | u8 active; |
141 | u8 swq_id; | ||
141 | }; | 142 | }; |
142 | 143 | ||
143 | #define IWL_NUM_SCAN_RATES (2) | 144 | #define IWL_NUM_SCAN_RATES (2) |
@@ -519,7 +520,6 @@ struct iwl_sensitivity_ranges { | |||
519 | * @ct_kill_threshold: temperature threshold | 520 | * @ct_kill_threshold: temperature threshold |
520 | * @calib_init_cfg: setup initial claibrations for the hw | 521 | * @calib_init_cfg: setup initial claibrations for the hw |
521 | * @struct iwl_sensitivity_ranges: range of sensitivity values | 522 | * @struct iwl_sensitivity_ranges: range of sensitivity values |
522 | * @first_ampdu_q: first HW queue available for ampdu | ||
523 | */ | 523 | */ |
524 | struct iwl_hw_params { | 524 | struct iwl_hw_params { |
525 | u16 max_txq_num; | 525 | u16 max_txq_num; |
@@ -541,7 +541,6 @@ struct iwl_hw_params { | |||
541 | u32 ct_kill_threshold; /* value in hw-dependent units */ | 541 | u32 ct_kill_threshold; /* value in hw-dependent units */ |
542 | u32 calib_init_cfg; | 542 | u32 calib_init_cfg; |
543 | const struct iwl_sensitivity_ranges *sens; | 543 | const struct iwl_sensitivity_ranges *sens; |
544 | u8 first_ampdu_q; | ||
545 | }; | 544 | }; |
546 | 545 | ||
547 | #define HT_SHORT_GI_20MHZ (1 << 0) | 546 | #define HT_SHORT_GI_20MHZ (1 << 0) |