diff options
author | Ben Cahill <ben.m.cahill@intel.com> | 2007-11-28 22:09:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:05:19 -0500 |
commit | bc47279f558e7e9ea70dad1d484d2816ec239bb0 (patch) | |
tree | be0b2be7b15e70df44f85f5c8bd8c3b9f21bc69d /drivers/net/wireless/iwlwifi/iwl-3945.h | |
parent | 81cd110d818dd4649cbac17f95f698a24c7acc45 (diff) |
iwlwifi: Add comments to some driver data structures
Add comments to some driver data structures
Remove unused "sched_retry" member from struct iwl3945_tx_queue
Signed-off-by: Ben Cahill <ben.m.cahill@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.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index 02040ef10da0..607a1ed542fb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h | |||
@@ -130,6 +130,7 @@ struct iwl3945_queue { | |||
130 | 130 | ||
131 | #define MAX_NUM_OF_TBS (20) | 131 | #define MAX_NUM_OF_TBS (20) |
132 | 132 | ||
133 | /* One for each TFD */ | ||
133 | struct iwl3945_tx_info { | 134 | struct iwl3945_tx_info { |
134 | struct ieee80211_tx_status status; | 135 | struct ieee80211_tx_status status; |
135 | struct sk_buff *skb[MAX_NUM_OF_TBS]; | 136 | struct sk_buff *skb[MAX_NUM_OF_TBS]; |
@@ -137,10 +138,15 @@ struct iwl3945_tx_info { | |||
137 | 138 | ||
138 | /** | 139 | /** |
139 | * struct iwl3945_tx_queue - Tx Queue for DMA | 140 | * struct iwl3945_tx_queue - Tx Queue for DMA |
140 | * @need_update: need to update read/write index | 141 | * @q: generic Rx/Tx queue descriptor |
141 | * @shed_retry: queue is HT AGG enabled | 142 | * @bd: base of circular buffer of TFDs |
143 | * @cmd: array of command/Tx buffers | ||
144 | * @dma_addr_cmd: physical address of cmd/tx buffer array | ||
145 | * @txb: array of per-TFD driver data | ||
146 | * @need_update: indicates need to update read/write index | ||
142 | * | 147 | * |
143 | * Queue consists of circular buffer of BD's and required locking structures. | 148 | * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame |
149 | * descriptors) and required locking structures. | ||
144 | */ | 150 | */ |
145 | struct iwl3945_tx_queue { | 151 | struct iwl3945_tx_queue { |
146 | struct iwl3945_queue q; | 152 | struct iwl3945_queue q; |
@@ -149,7 +155,6 @@ struct iwl3945_tx_queue { | |||
149 | dma_addr_t dma_addr_cmd; | 155 | dma_addr_t dma_addr_cmd; |
150 | struct iwl3945_tx_info *txb; | 156 | struct iwl3945_tx_info *txb; |
151 | int need_update; | 157 | int need_update; |
152 | int sched_retry; | ||
153 | int active; | 158 | int active; |
154 | }; | 159 | }; |
155 | 160 | ||
@@ -325,6 +330,13 @@ struct iwl3945_cmd_meta { | |||
325 | 330 | ||
326 | } __attribute__ ((packed)); | 331 | } __attribute__ ((packed)); |
327 | 332 | ||
333 | /** | ||
334 | * struct iwl3945_cmd | ||
335 | * | ||
336 | * For allocation of the command and tx queues, this establishes the overall | ||
337 | * size of the largest command we send to uCode, except for a scan command | ||
338 | * (which is relatively huge; space is allocated separately). | ||
339 | */ | ||
328 | struct iwl3945_cmd { | 340 | struct iwl3945_cmd { |
329 | struct iwl3945_cmd_meta meta; | 341 | struct iwl3945_cmd_meta meta; |
330 | struct iwl3945_cmd_header hdr; | 342 | struct iwl3945_cmd_header hdr; |
@@ -522,6 +534,19 @@ struct iwl3945_ibss_seq { | |||
522 | struct list_head list; | 534 | struct list_head list; |
523 | }; | 535 | }; |
524 | 536 | ||
537 | /** | ||
538 | * struct iwl4965_driver_hw_info | ||
539 | * @max_txq_num: Max # Tx queues supported | ||
540 | * @ac_queue_count: # Tx queues for EDCA Access Categories (AC) | ||
541 | * @tx_cmd_len: Size of Tx command (but not including frame itself) | ||
542 | * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2) | ||
543 | * @rx_buffer_size: | ||
544 | * @max_rxq_log: Log-base-2 of max_rxq_size | ||
545 | * @max_stations: | ||
546 | * @bcast_sta_id: | ||
547 | * @shared_virt: Pointer to driver/uCode shared Tx Byte Counts and Rx status | ||
548 | * @shared_phys: Physical Pointer to Tx Byte Counts and Rx status | ||
549 | */ | ||
525 | struct iwl3945_driver_hw_info { | 550 | struct iwl3945_driver_hw_info { |
526 | u16 max_txq_num; | 551 | u16 max_txq_num; |
527 | u16 ac_queue_count; | 552 | u16 ac_queue_count; |
@@ -857,6 +882,8 @@ struct iwl3945_priv { | |||
857 | u16 last_seq_num; | 882 | u16 last_seq_num; |
858 | u16 last_frag_num; | 883 | u16 last_frag_num; |
859 | unsigned long last_packet_time; | 884 | unsigned long last_packet_time; |
885 | |||
886 | /* Hash table for finding stations in IBSS network */ | ||
860 | struct list_head ibss_mac_hash[IWL_IBSS_MAC_HASH_SIZE]; | 887 | struct list_head ibss_mac_hash[IWL_IBSS_MAC_HASH_SIZE]; |
861 | 888 | ||
862 | /* eeprom */ | 889 | /* eeprom */ |