Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / net / wireless / intel / iwlwifi / mvm / fw-api-tx.h

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
index 4144623e16168ebf90972d201aa55db07bf0b246..6b4c63a5e6259751a7a3c89e82b195ccb3ff8488 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
@@ -675,13 +675,21 @@ static inline u32 iwl_mvm_get_scd_ssn(struct iwl_mvm_tx_resp *tx_resp)
                            tx_resp->frame_count) & 0xfff;
 }
 
+/* Available options for the SCD_QUEUE_CFG HCMD */
+enum iwl_scd_cfg_actions {
+       SCD_CFG_DISABLE_QUEUE           = 0x0,
+       SCD_CFG_ENABLE_QUEUE            = 0x1,
+       SCD_CFG_UPDATE_QUEUE_TID        = 0x2,
+};
+
 /**
  * struct iwl_scd_txq_cfg_cmd - New txq hw scheduler config command
  * @token:
  * @sta_id: station id
  * @tid:
  * @scd_queue: scheduler queue to confiug
- * @enable: 1 queue enable, 0 queue disable
+ * @action: 1 queue enable, 0 queue disable, 2 change txq's tid owner
+ *     Value is one of %iwl_scd_cfg_actions options
  * @aggregate: 1 aggregated queue, 0 otherwise
  * @tx_fifo: %enum iwl_mvm_tx_fifo
  * @window: BA window size
@@ -692,7 +700,7 @@ struct iwl_scd_txq_cfg_cmd {
        u8 sta_id;
        u8 tid;
        u8 scd_queue;
-       u8 enable;
+       u8 action;
        u8 aggregate;
        u8 tx_fifo;
        u8 window;