lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: some fh document fix and cleanup

Browse Source 
This patch cleans up some flow handler related document. It also
removes some blank lines.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Zhu, Yi
2008-11-12 13:14:10 -08:00
committed by John W. Linville
parent 352bc8de19
commit 34faf780cf
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/iwlwifi/iwl-fh.h
View File

@@ -440,7 +440,7 @@ static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr)
* @lo: low [31:0] portion of the dma address of TX buffer * @lo: low [31:0] portion of the dma address of TX buffer
* every even is unaligned on 16 bit boundary * every even is unaligned on 16 bit boundary
* @hi_n_len 0-3 [35:32] portion of dma * @hi_n_len 0-3 [35:32] portion of dma
* 4-16 length of the tx buffer * 4-15 length of the tx buffer
*/ */
struct iwl_tfd_tb { struct iwl_tfd_tb {
__le32 lo; __le32 lo;
@@ -453,7 +453,8 @@ struct iwl_tfd_tb {
* Transmit Frame Descriptor (TFD) * Transmit Frame Descriptor (TFD)
* *
* @ __reserved1[3] reserved * @ __reserved1[3] reserved
* @ num_tbs 0-5 number of active tbs * @ num_tbs 0-4 number of active tbs
* 5 reserved
* 6-7 padding (not used) * 6-7 padding (not used)
* @ tbs[20] transmit frame buffer descriptors * @ tbs[20] transmit frame buffer descriptors
* @ __pad padding * @ __pad padding
@@ -473,8 +474,6 @@ struct iwl_tfd_tb {
* Tx frame, up to 8 KBytes in size. * Tx frame, up to 8 KBytes in size.
* *
* A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx. * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx.
*
* Bit fields in the control dword (val0):
*/ */
struct iwl_tfd { struct iwl_tfd {
u8 __reserved1[3]; u8 __reserved1[3];
@@ -485,6 +484,6 @@ struct iwl_tfd {
/* Keep Warm Size */ /* Keep Warm Size */
#define IWL_KW_SIZE 0x1000 /*4k */ #define IWL_KW_SIZE 0x1000 /* 4k */
#endif /* !__iwl_fh_h__ */ #endif /* !__iwl_fh_h__ */

4
drivers/net/wireless/iwlwifi/iwl-tx.c
View File

@@ -587,8 +587,6 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)
iwl_release_nic_access(priv); iwl_release_nic_access(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
/* Alloc and init all Tx queues, including the command queue (#4) */ /* Alloc and init all Tx queues, including the command queue (#4) */
for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ? slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?
@@ -618,11 +616,9 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)
*/ */
void iwl_txq_ctx_stop(struct iwl_priv *priv) void iwl_txq_ctx_stop(struct iwl_priv *priv)
{ {
int txq_id; int txq_id;
unsigned long flags; unsigned long flags;
/* Turn off all Tx DMA fifos */ /* Turn off all Tx DMA fifos */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (iwl_grab_nic_access(priv)) { if (iwl_grab_nic_access(priv)) {