diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-05-04 22:22:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-14 16:29:47 -0400 |
commit | 164669032ecbf7c9a3bc78adad4e13ee486e975c (patch) | |
tree | abd5e1b801267a207effcd604889cca9b246e1a2 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
parent | d67f5489d8d9be09bc8e1615ec6c57c3120a731d (diff) |
iwlwifi: remove 4965 prefix from iwl4965_kw and iwl4965_tx_queue
This patch removes the 4965 prefix to form iwl_kw and iwl_tx_queue structs,
as they are used mostly in iwlcore now.
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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 1683bee800d1..5dccc5a8fa94 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -124,7 +124,7 @@ struct iwl4965_tx_info { | |||
124 | }; | 124 | }; |
125 | 125 | ||
126 | /** | 126 | /** |
127 | * struct iwl4965_tx_queue - Tx Queue for DMA | 127 | * struct iwl_tx_queue - Tx Queue for DMA |
128 | * @q: generic Rx/Tx queue descriptor | 128 | * @q: generic Rx/Tx queue descriptor |
129 | * @bd: base of circular buffer of TFDs | 129 | * @bd: base of circular buffer of TFDs |
130 | * @cmd: array of command/Tx buffers | 130 | * @cmd: array of command/Tx buffers |
@@ -136,7 +136,7 @@ struct iwl4965_tx_info { | |||
136 | * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame | 136 | * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame |
137 | * descriptors) and required locking structures. | 137 | * descriptors) and required locking structures. |
138 | */ | 138 | */ |
139 | struct iwl4965_tx_queue { | 139 | struct iwl_tx_queue { |
140 | struct iwl4965_queue q; | 140 | struct iwl4965_queue q; |
141 | struct iwl_tfd_frame *bd; | 141 | struct iwl_tfd_frame *bd; |
142 | struct iwl_cmd *cmd; | 142 | struct iwl_cmd *cmd; |
@@ -729,7 +729,7 @@ extern void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio); | |||
729 | * Forward declare iwl-4965.c functions for iwl-base.c | 729 | * Forward declare iwl-4965.c functions for iwl-base.c |
730 | */ | 730 | */ |
731 | extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv, | 731 | extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv, |
732 | struct iwl4965_tx_queue *txq, | 732 | struct iwl_tx_queue *txq, |
733 | u16 byte_cnt); | 733 | u16 byte_cnt); |
734 | extern void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, | 734 | extern void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, |
735 | int is_ap); | 735 | int is_ap); |
@@ -761,9 +761,9 @@ static inline void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv, | |||
761 | #endif /*CONFIG_IWL4965_HT */ | 761 | #endif /*CONFIG_IWL4965_HT */ |
762 | /* Structures, enum, and defines specific to the 4965 */ | 762 | /* Structures, enum, and defines specific to the 4965 */ |
763 | 763 | ||
764 | #define IWL4965_KW_SIZE 0x1000 /*4k */ | 764 | #define IWL_KW_SIZE 0x1000 /*4k */ |
765 | 765 | ||
766 | struct iwl4965_kw { | 766 | struct iwl_kw { |
767 | dma_addr_t dma_addr; | 767 | dma_addr_t dma_addr; |
768 | void *v_addr; | 768 | void *v_addr; |
769 | size_t size; | 769 | size_t size; |
@@ -1061,9 +1061,9 @@ struct iwl_priv { | |||
1061 | 1061 | ||
1062 | /* Rx and Tx DMA processing queues */ | 1062 | /* Rx and Tx DMA processing queues */ |
1063 | struct iwl_rx_queue rxq; | 1063 | struct iwl_rx_queue rxq; |
1064 | struct iwl4965_tx_queue txq[IWL_MAX_NUM_QUEUES]; | 1064 | struct iwl_tx_queue txq[IWL_MAX_NUM_QUEUES]; |
1065 | unsigned long txq_ctx_active_msk; | 1065 | unsigned long txq_ctx_active_msk; |
1066 | struct iwl4965_kw kw; /* keep warm address */ | 1066 | struct iwl_kw kw; /* keep warm address */ |
1067 | u32 scd_base_addr; /* scheduler sram base address */ | 1067 | u32 scd_base_addr; /* scheduler sram base address */ |
1068 | 1068 | ||
1069 | unsigned long status; | 1069 | unsigned long status; |