diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-12-18 21:37:43 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:59:23 -0500 |
commit | 8cd812bcda06645160b0b279e1a125271a73411c (patch) | |
tree | 5ac158f40ed46fe8c4f68dd7ebe701ac616655fd /drivers/net/wireless/iwlwifi/iwl-3945.c | |
parent | cbba18c6e3d1b2610f9a63c4636247af26141686 (diff) |
iwl3945: use iwl_rb_status
This patch makes use of iwl_rb_status also in 3945. The structure
for 3945 is not the same but since only closed_rb_num filed is used
in both cases there is no reason to duplicate it.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 5a8b75d94d7..cb864449c39 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -974,9 +974,7 @@ static int iwl3945_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq) | |||
974 | } | 974 | } |
975 | 975 | ||
976 | iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->dma_addr); | 976 | iwl_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->dma_addr); |
977 | iwl_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0), | 977 | iwl_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0), rxq->rb_stts_dma); |
978 | priv->shared_phys + | ||
979 | offsetof(struct iwl3945_shared, rx_read_ptr[0])); | ||
980 | iwl_write_direct32(priv, FH39_RCSR_WPTR(0), 0); | 978 | iwl_write_direct32(priv, FH39_RCSR_WPTR(0), 0); |
981 | iwl_write_direct32(priv, FH39_RCSR_CONFIG(0), | 979 | iwl_write_direct32(priv, FH39_RCSR_CONFIG(0), |
982 | FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE | | 980 | FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE | |
@@ -2377,13 +2375,6 @@ int iwl3945_hw_tx_queue_init(struct iwl_priv *priv, struct iwl3945_tx_queue *txq | |||
2377 | return 0; | 2375 | return 0; |
2378 | } | 2376 | } |
2379 | 2377 | ||
2380 | int iwl3945_hw_get_rx_read(struct iwl_priv *priv) | ||
2381 | { | ||
2382 | struct iwl3945_shared *shared_data = priv->shared_virt; | ||
2383 | |||
2384 | return le32_to_cpu(shared_data->rx_read_ptr[0]); | ||
2385 | } | ||
2386 | |||
2387 | /** | 2378 | /** |
2388 | * iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table | 2379 | * iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table |
2389 | */ | 2380 | */ |