diff options
author | Zhu, Yi <yi.zhu@intel.com> | 2008-11-12 16:14:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:41:20 -0500 |
commit | 34faf780cf342b2c83ae40a2eecf33e55f7002a5 (patch) | |
tree | ef9d0152b891b1092ddb289e87cbee651eec8dba | |
parent | 352bc8de19a7e5e065d422825e226e8e80cd6576 (diff) |
iwlwifi: some fh document fix and cleanup
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>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fh.h | 9 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h index e46300c28a8f..694ebb0d2ecf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fh.h +++ b/drivers/net/wireless/iwlwifi/iwl-fh.h | |||
@@ -440,7 +440,7 @@ static inline u8 iwl_get_dma_hi_addr(dma_addr_t addr) | |||
440 | * @lo: low [31:0] portion of the dma address of TX buffer | 440 | * @lo: low [31:0] portion of the dma address of TX buffer |
441 | * every even is unaligned on 16 bit boundary | 441 | * every even is unaligned on 16 bit boundary |
442 | * @hi_n_len 0-3 [35:32] portion of dma | 442 | * @hi_n_len 0-3 [35:32] portion of dma |
443 | * 4-16 length of the tx buffer | 443 | * 4-15 length of the tx buffer |
444 | */ | 444 | */ |
445 | struct iwl_tfd_tb { | 445 | struct iwl_tfd_tb { |
446 | __le32 lo; | 446 | __le32 lo; |
@@ -453,7 +453,8 @@ struct iwl_tfd_tb { | |||
453 | * Transmit Frame Descriptor (TFD) | 453 | * Transmit Frame Descriptor (TFD) |
454 | * | 454 | * |
455 | * @ __reserved1[3] reserved | 455 | * @ __reserved1[3] reserved |
456 | * @ num_tbs 0-5 number of active tbs | 456 | * @ num_tbs 0-4 number of active tbs |
457 | * 5 reserved | ||
457 | * 6-7 padding (not used) | 458 | * 6-7 padding (not used) |
458 | * @ tbs[20] transmit frame buffer descriptors | 459 | * @ tbs[20] transmit frame buffer descriptors |
459 | * @ __pad padding | 460 | * @ __pad padding |
@@ -473,8 +474,6 @@ struct iwl_tfd_tb { | |||
473 | * Tx frame, up to 8 KBytes in size. | 474 | * Tx frame, up to 8 KBytes in size. |
474 | * | 475 | * |
475 | * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx. | 476 | * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx. |
476 | * | ||
477 | * Bit fields in the control dword (val0): | ||
478 | */ | 477 | */ |
479 | struct iwl_tfd { | 478 | struct iwl_tfd { |
480 | u8 __reserved1[3]; | 479 | u8 __reserved1[3]; |
@@ -485,6 +484,6 @@ struct iwl_tfd { | |||
485 | 484 | ||
486 | 485 | ||
487 | /* Keep Warm Size */ | 486 | /* Keep Warm Size */ |
488 | #define IWL_KW_SIZE 0x1000 /*4k */ | 487 | #define IWL_KW_SIZE 0x1000 /* 4k */ |
489 | 488 | ||
490 | #endif /* !__iwl_fh_h__ */ | 489 | #endif /* !__iwl_fh_h__ */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index d9638d75a970..9f0705bcd03a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
@@ -587,8 +587,6 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) | |||
587 | iwl_release_nic_access(priv); | 587 | iwl_release_nic_access(priv); |
588 | spin_unlock_irqrestore(&priv->lock, flags); | 588 | spin_unlock_irqrestore(&priv->lock, flags); |
589 | 589 | ||
590 | |||
591 | |||
592 | /* Alloc and init all Tx queues, including the command queue (#4) */ | 590 | /* Alloc and init all Tx queues, including the command queue (#4) */ |
593 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { | 591 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { |
594 | slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ? | 592 | slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ? |
@@ -618,11 +616,9 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv) | |||
618 | */ | 616 | */ |
619 | void iwl_txq_ctx_stop(struct iwl_priv *priv) | 617 | void iwl_txq_ctx_stop(struct iwl_priv *priv) |
620 | { | 618 | { |
621 | |||
622 | int txq_id; | 619 | int txq_id; |
623 | unsigned long flags; | 620 | unsigned long flags; |
624 | 621 | ||
625 | |||
626 | /* Turn off all Tx DMA fifos */ | 622 | /* Turn off all Tx DMA fifos */ |
627 | spin_lock_irqsave(&priv->lock, flags); | 623 | spin_lock_irqsave(&priv->lock, flags); |
628 | if (iwl_grab_nic_access(priv)) { | 624 | if (iwl_grab_nic_access(priv)) { |