Commit 6d8f6eeb authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville

iwlagn: transport layer should receive iwl_trans

Change a lot of functions to have them receive iwl_trans and not iwl_priv.
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 790428b6
...@@ -140,28 +140,26 @@ irqreturn_t iwl_isr_ict(int irq, void *data); ...@@ -140,28 +140,26 @@ irqreturn_t iwl_isr_ict(int irq, void *data);
* TX / HCMD * TX / HCMD
******************************************************/ ******************************************************/
void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq); void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv, int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
struct iwl_tx_queue *txq, struct iwl_tx_queue *txq,
dma_addr_t addr, u16 len, u8 reset); dma_addr_t addr, u16 len, u8 reset);
int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q, int iwl_queue_init(struct iwl_queue *q, int count, int slots_num, u32 id);
int count, int slots_num, u32 id); int iwl_trans_pcie_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
int iwl_trans_pcie_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd); int __must_check iwl_trans_pcie_send_cmd_pdu(struct iwl_trans *trans, u8 id,
int __must_check iwl_trans_pcie_send_cmd_pdu(struct iwl_priv *priv, u8 id,
u32 flags, u16 len, const void *data); u32 flags, u16 len, const void *data);
void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb); void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);
void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_priv *priv, void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
struct iwl_tx_queue *txq, struct iwl_tx_queue *txq,
u16 byte_cnt); u16 byte_cnt);
int iwl_trans_pcie_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, int iwl_trans_pcie_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
u16 ssn_idx, u8 tx_fifo); u16 ssn_idx, u8 tx_fifo);
void iwl_trans_set_wr_ptrs(struct iwl_priv *priv, void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index);
int txq_id, u32 index);
void iwl_trans_tx_queue_set_status(struct iwl_priv *priv, void iwl_trans_tx_queue_set_status(struct iwl_priv *priv,
struct iwl_tx_queue *txq, struct iwl_tx_queue *txq,
int tx_fifo_id, int scd_retry); int tx_fifo_id, int scd_retry);
void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid, void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid,
int frame_limit); int frame_limit);
void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq, void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
int index); int index);
void iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index, void iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
struct sk_buff_head *skbs); struct sk_buff_head *skbs);
......
This diff is collapsed.
...@@ -109,18 +109,18 @@ struct iwl_trans_ops { ...@@ -109,18 +109,18 @@ struct iwl_trans_ops {
struct iwl_trans *(*alloc)(struct iwl_shared *shrd); struct iwl_trans *(*alloc)(struct iwl_shared *shrd);
int (*request_irq)(struct iwl_trans *iwl_trans); int (*request_irq)(struct iwl_trans *iwl_trans);
int (*start_device)(struct iwl_priv *priv); int (*start_device)(struct iwl_trans *trans);
int (*prepare_card_hw)(struct iwl_priv *priv); int (*prepare_card_hw)(struct iwl_trans *trans);
void (*stop_device)(struct iwl_priv *priv); void (*stop_device)(struct iwl_trans *trans);
void (*tx_start)(struct iwl_priv *priv); void (*tx_start)(struct iwl_trans *trans);
void (*tx_free)(struct iwl_priv *priv); void (*tx_free)(struct iwl_trans *trans);
void (*rx_free)(struct iwl_trans *trans); void (*rx_free)(struct iwl_trans *trans);
int (*send_cmd)(struct iwl_priv *priv, struct iwl_host_cmd *cmd); int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
int (*send_cmd_pdu)(struct iwl_priv *priv, u8 id, u32 flags, u16 len, int (*send_cmd_pdu)(struct iwl_trans *trans, u8 id, u32 flags, u16 len,
const void *data); const void *data);
struct iwl_tx_cmd * (*get_tx_cmd)(struct iwl_priv *priv, int txq_id); struct iwl_tx_cmd * (*get_tx_cmd)(struct iwl_trans *trans, int txq_id);
int (*tx)(struct iwl_priv *priv, struct sk_buff *skb, int (*tx)(struct iwl_priv *priv, struct sk_buff *skb,
struct iwl_tx_cmd *tx_cmd, int txq_id, __le16 fc, bool ampdu, struct iwl_tx_cmd *tx_cmd, int txq_id, __le16 fc, bool ampdu,
struct iwl_rxon_context *ctx); struct iwl_rxon_context *ctx);
...@@ -132,10 +132,10 @@ struct iwl_trans_ops { ...@@ -132,10 +132,10 @@ struct iwl_trans_ops {
void (*txq_agg_setup)(struct iwl_priv *priv, int sta_id, int tid, void (*txq_agg_setup)(struct iwl_priv *priv, int sta_id, int tid,
int frame_limit); int frame_limit);
void (*kick_nic)(struct iwl_priv *priv); void (*kick_nic)(struct iwl_trans *trans);
void (*disable_sync_irq)(struct iwl_trans *trans); void (*disable_sync_irq)(struct iwl_trans *trans);
void (*free)(struct iwl_priv *priv); void (*free)(struct iwl_trans *trans);
int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir); int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);
int (*suspend)(struct iwl_trans *trans); int (*suspend)(struct iwl_trans *trans);
...@@ -163,22 +163,22 @@ static inline int iwl_trans_request_irq(struct iwl_trans *trans) ...@@ -163,22 +163,22 @@ static inline int iwl_trans_request_irq(struct iwl_trans *trans)
static inline int iwl_trans_start_device(struct iwl_trans *trans) static inline int iwl_trans_start_device(struct iwl_trans *trans)
{ {
return trans->ops->start_device(priv(trans)); return trans->ops->start_device(trans);
} }
static inline int iwl_trans_prepare_card_hw(struct iwl_trans *trans) static inline int iwl_trans_prepare_card_hw(struct iwl_trans *trans)
{ {
return trans->ops->prepare_card_hw(priv(trans)); return trans->ops->prepare_card_hw(trans);
} }
static inline void iwl_trans_stop_device(struct iwl_trans *trans) static inline void iwl_trans_stop_device(struct iwl_trans *trans)
{ {
trans->ops->stop_device(priv(trans)); trans->ops->stop_device(trans);
} }
static inline void iwl_trans_tx_start(struct iwl_trans *trans) static inline void iwl_trans_tx_start(struct iwl_trans *trans)
{ {
trans->ops->tx_start(priv(trans)); trans->ops->tx_start(trans);
} }
static inline void iwl_trans_rx_free(struct iwl_trans *trans) static inline void iwl_trans_rx_free(struct iwl_trans *trans)
...@@ -188,25 +188,25 @@ static inline void iwl_trans_rx_free(struct iwl_trans *trans) ...@@ -188,25 +188,25 @@ static inline void iwl_trans_rx_free(struct iwl_trans *trans)
static inline void iwl_trans_tx_free(struct iwl_trans *trans) static inline void iwl_trans_tx_free(struct iwl_trans *trans)
{ {
trans->ops->tx_free(priv(trans)); trans->ops->tx_free(trans);
} }
static inline int iwl_trans_send_cmd(struct iwl_trans *trans, static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
struct iwl_host_cmd *cmd) struct iwl_host_cmd *cmd)
{ {
return trans->ops->send_cmd(priv(trans), cmd); return trans->ops->send_cmd(trans, cmd);
} }
static inline int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id, static inline int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id,
u32 flags, u16 len, const void *data) u32 flags, u16 len, const void *data)
{ {
return trans->ops->send_cmd_pdu(priv(trans), id, flags, len, data); return trans->ops->send_cmd_pdu(trans, id, flags, len, data);
} }
static inline struct iwl_tx_cmd *iwl_trans_get_tx_cmd(struct iwl_trans *trans, static inline struct iwl_tx_cmd *iwl_trans_get_tx_cmd(struct iwl_trans *trans,
int txq_id) int txq_id)
{ {
return trans->ops->get_tx_cmd(priv(trans), txq_id); return trans->ops->get_tx_cmd(trans, txq_id);
} }
static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb, static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,
...@@ -238,7 +238,7 @@ static inline void iwl_trans_txq_agg_setup(struct iwl_trans *trans, int sta_id, ...@@ -238,7 +238,7 @@ static inline void iwl_trans_txq_agg_setup(struct iwl_trans *trans, int sta_id,
static inline void iwl_trans_kick_nic(struct iwl_trans *trans) static inline void iwl_trans_kick_nic(struct iwl_trans *trans)
{ {
trans->ops->kick_nic(priv(trans)); trans->ops->kick_nic(trans);
} }
static inline void iwl_trans_disable_sync_irq(struct iwl_trans *trans) static inline void iwl_trans_disable_sync_irq(struct iwl_trans *trans)
...@@ -248,7 +248,7 @@ static inline void iwl_trans_disable_sync_irq(struct iwl_trans *trans) ...@@ -248,7 +248,7 @@ static inline void iwl_trans_disable_sync_irq(struct iwl_trans *trans)
static inline void iwl_trans_free(struct iwl_trans *trans) static inline void iwl_trans_free(struct iwl_trans *trans)
{ {
trans->ops->free(priv(trans)); trans->ops->free(trans);
} }
static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans, static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment