iwlwifi: move queue mapping out of transport

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / iwl-op-mode.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index 6ea4163ff56a591117a36eb75c03587131601cc7..b1fd251e88d5e761e5dcc3dfe45c6c7f10339410 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -111,10 +111,10 @@ struct iwl_fw;
  * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the
  *     HCMD the this Rx responds to.
  *     Must be atomic.
- * @queue_full: notifies that a HW queue is full. Ac is the ac of the queue
+ * @queue_full: notifies that a HW queue is full.
  *     Must be atomic
  * @queue_not_full: notifies that a HW queue is not full any more.
- *     Ac is the ac of the queue. Must be atomic
+ *     Must be atomic
  * @hw_rf_kill:notifies of a change in the HW rf kill switch. True means that
  *     the radio is killed. Must be atomic.
  * @free_skb: allows the transport layer to free skbs that haven't been
@@ -132,8 +132,8 @@ struct iwl_op_mode_ops {
        void (*stop)(struct iwl_op_mode *op_mode);
        int (*rx)(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,
                  struct iwl_device_cmd *cmd);
-       void (*queue_full)(struct iwl_op_mode *op_mode, u8 ac);
-       void (*queue_not_full)(struct iwl_op_mode *op_mode, u8 ac);
+       void (*queue_full)(struct iwl_op_mode *op_mode, int queue);
+       void (*queue_not_full)(struct iwl_op_mode *op_mode, int queue);
        void (*hw_rf_kill)(struct iwl_op_mode *op_mode, bool state);
        void (*free_skb)(struct iwl_op_mode *op_mode, struct sk_buff *skb);
        void (*nic_error)(struct iwl_op_mode *op_mode);
@@ -169,15 +169,16 @@ static inline int iwl_op_mode_rx(struct iwl_op_mode *op_mode,
        return op_mode->ops->rx(op_mode, rxb, cmd);
 }
 
-static inline void iwl_op_mode_queue_full(struct iwl_op_mode *op_mode, u8 ac)
+static inline void iwl_op_mode_queue_full(struct iwl_op_mode *op_mode,
+                                         int queue)
 {
-       op_mode->ops->queue_full(op_mode, ac);
+       op_mode->ops->queue_full(op_mode, queue);
 }
 
 static inline void iwl_op_mode_queue_not_full(struct iwl_op_mode *op_mode,
-                                             u8 ac)
+                                             int queue)
 {
-       op_mode->ops->queue_not_full(op_mode, ac);
+       op_mode->ops->queue_not_full(op_mode, queue);
 }
 
 static inline void iwl_op_mode_hw_rf_kill(struct iwl_op_mode *op_mode,