aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-fh.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2010-06-29 14:29:49 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-07-09 13:17:24 -0400
commit9726f347f82b0ce802530deb00ee2dde369e1d2f (patch)
treec34f85766da18b444c08465b8c0bc96c6e2c8e68 /drivers/net/wireless/iwlwifi/iwl-fh.h
parent41691de32664f06507c24cea499b307624e3183e (diff)
iwlagn: fix the bit mask of a FH register in stop Tx DMA flow
When we stop the Tx DMA channels, we poll bits 16:31 in FH_TSSR_RX_STATUS_REG. From 4965 and up, only the bits 16:26 are legal. Bits 27:31 are not used and are always unset. Polling them will lead to fail on timeout but since the timeout is quite small, the stall was not felt. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fh.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fh.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 113c3669b9ce..dd896f28c931 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -398,12 +398,7 @@
398 */ 398 */
399#define FH_TSSR_TX_ERROR_REG (FH_TSSR_LOWER_BOUND + 0x018) 399#define FH_TSSR_TX_ERROR_REG (FH_TSSR_LOWER_BOUND + 0x018)
400 400
401#define FH_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_chnl) ((1 << (_chnl)) << 24) 401#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 << (_chnl)) << 16)
402#define FH_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_chnl) ((1 << (_chnl)) << 16)
403
404#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) \
405 (FH_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_chnl) | \
406 FH_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_chnl))
407 402
408/* Tx service channels */ 403/* Tx service channels */
409#define FH_SRVC_CHNL (9) 404#define FH_SRVC_CHNL (9)