diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-05-04 22:22:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-14 16:29:46 -0400 |
commit | d67f5489d8d9be09bc8e1615ec6c57c3120a731d (patch) | |
tree | 35f3734ec1707ff2d70db32227eaaa7eb50e4293 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
parent | 5ec0397679f1c1606199cfd6f3e24351891c60c3 (diff) |
iwlwifi: handle shared memory Rx index access
This patch splits ucode's and driver's shared memory Rx index access to
match 4965 and 5000 offsets.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 25dce14c87d8..1683bee800d1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -697,7 +697,6 @@ extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd, | |||
697 | extern int iwl4965_hw_get_temperature(struct iwl_priv *priv); | 697 | extern int iwl4965_hw_get_temperature(struct iwl_priv *priv); |
698 | extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv, | 698 | extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv, |
699 | struct iwl4965_frame *frame, u8 rate); | 699 | struct iwl4965_frame *frame, u8 rate); |
700 | extern int iwl4965_hw_get_rx_read(struct iwl_priv *priv); | ||
701 | extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv, | 700 | extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv, |
702 | struct iwl_cmd *cmd, | 701 | struct iwl_cmd *cmd, |
703 | struct ieee80211_tx_control *ctrl, | 702 | struct ieee80211_tx_control *ctrl, |
@@ -1138,6 +1137,7 @@ struct iwl_priv { | |||
1138 | struct iwl_hw_params hw_params; | 1137 | struct iwl_hw_params hw_params; |
1139 | /* driver/uCode shared Tx Byte Counts and Rx status */ | 1138 | /* driver/uCode shared Tx Byte Counts and Rx status */ |
1140 | void *shared_virt; | 1139 | void *shared_virt; |
1140 | int rb_closed_offset; | ||
1141 | /* Physical Pointer to Tx Byte Counts and Rx status */ | 1141 | /* Physical Pointer to Tx Byte Counts and Rx status */ |
1142 | dma_addr_t shared_phys; | 1142 | dma_addr_t shared_phys; |
1143 | 1143 | ||