diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-05-15 01:54:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:48:00 -0400 |
commit | fd4abac54a7a7f1c0acad5ddc1fbf4af22f92569 (patch) | |
tree | 78e95821800cfa2b2a8ded7ecc1e51227e194e1a /drivers/net/wireless/iwlwifi/iwl-core.h | |
parent | 54dbb525e7b8580b86af352cf60b27cc889c2ae4 (diff) |
iwlwifi: move TX code into iwl-tx.c
This patch moves the sending part of the TX code into iwl-tx.c
including sending host commands.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index dcf1e562af32..b159fd3c93ca 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -87,7 +87,6 @@ struct iwl_hcmd_ops { | |||
87 | }; | 87 | }; |
88 | struct iwl_hcmd_utils_ops { | 88 | struct iwl_hcmd_utils_ops { |
89 | u16 (*get_hcmd_size)(u8 cmd_id, u16 len); | 89 | u16 (*get_hcmd_size)(u8 cmd_id, u16 len); |
90 | int (*enqueue_hcmd)(struct iwl_priv *priv, struct iwl_host_cmd *cmd); | ||
91 | u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data); | 90 | u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data); |
92 | #ifdef CONFIG_IWLWIFI_RUN_TIME_CALIB | 91 | #ifdef CONFIG_IWLWIFI_RUN_TIME_CALIB |
93 | void (*gain_computation)(struct iwl_priv *priv, | 92 | void (*gain_computation)(struct iwl_priv *priv, |
@@ -208,10 +207,14 @@ void iwl_rx_allocate(struct iwl_priv *priv); | |||
208 | * TX | 207 | * TX |
209 | ******************************************************/ | 208 | ******************************************************/ |
210 | int iwl_txq_ctx_reset(struct iwl_priv *priv); | 209 | int iwl_txq_ctx_reset(struct iwl_priv *priv); |
210 | int iwl_tx_skb(struct iwl_priv *priv, | ||
211 | struct sk_buff *skb, struct ieee80211_tx_control *ctl); | ||
211 | /* FIXME: remove when free Tx is fully merged into iwlcore */ | 212 | /* FIXME: remove when free Tx is fully merged into iwlcore */ |
212 | int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq); | 213 | int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq); |
213 | void iwl_hw_txq_ctx_free(struct iwl_priv *priv); | 214 | void iwl_hw_txq_ctx_free(struct iwl_priv *priv); |
214 | 215 | int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd, | |
216 | dma_addr_t addr, u16 len); | ||
217 | int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq); | ||
215 | /***************************************************** | 218 | /***************************************************** |
216 | * S e n d i n g H o s t C o m m a n d s * | 219 | * S e n d i n g H o s t C o m m a n d s * |
217 | *****************************************************/ | 220 | *****************************************************/ |
@@ -227,6 +230,8 @@ int iwl_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len, | |||
227 | int (*callback)(struct iwl_priv *priv, | 230 | int (*callback)(struct iwl_priv *priv, |
228 | struct iwl_cmd *cmd, | 231 | struct iwl_cmd *cmd, |
229 | struct sk_buff *skb)); | 232 | struct sk_buff *skb)); |
233 | |||
234 | int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd); | ||
230 | /*************** DRIVER STATUS FUNCTIONS *****/ | 235 | /*************** DRIVER STATUS FUNCTIONS *****/ |
231 | 236 | ||
232 | #define STATUS_HCMD_ACTIVE 0 /* host command in progress */ | 237 | #define STATUS_HCMD_ACTIVE 0 /* host command in progress */ |