aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-10-27 19:50:38 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-28 06:25:53 -0400
commit2e5655e758736488abbe9c024c8cda0e367214e5 (patch)
treea92aa9b640a09819de069cac1f1af4ab137c296c /drivers
parent645a3abd73c2ac05d375f080d2f58d56e1502562 (diff)
igb: cleanup igb.h header whitespace and some structure formatting
This patch changes the layout of the ring and adapter structs to fill a few holes in the structure. It also cleans up some whitespace and formatting issues. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/igb/igb.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index b9fcfd3c9576..3298f5a11dab 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -185,16 +185,15 @@ struct igb_ring {
185 dma_addr_t dma; /* phys address of the ring */ 185 dma_addr_t dma; /* phys address of the ring */
186 void *desc; /* descriptor ring memory */ 186 void *desc; /* descriptor ring memory */
187 unsigned int size; /* length of desc. ring in bytes */ 187 unsigned int size; /* length of desc. ring in bytes */
188 unsigned int count; /* number of desc. in the ring */ 188 u16 count; /* number of desc. in the ring */
189 u16 next_to_use; 189 u16 next_to_use;
190 u16 next_to_clean; 190 u16 next_to_clean;
191 u8 queue_index;
192 u8 reg_idx;
191 void __iomem *head; 193 void __iomem *head;
192 void __iomem *tail; 194 void __iomem *tail;
193 struct igb_buffer *buffer_info; /* array of buffer info structs */ 195 struct igb_buffer *buffer_info; /* array of buffer info structs */
194 196
195 u8 queue_index;
196 u8 reg_idx;
197
198 unsigned int total_bytes; 197 unsigned int total_bytes;
199 unsigned int total_packets; 198 unsigned int total_packets;
200 199
@@ -249,6 +248,7 @@ struct igb_adapter {
249 u32 en_mng_pt; 248 u32 en_mng_pt;
250 u16 link_speed; 249 u16 link_speed;
251 u16 link_duplex; 250 u16 link_duplex;
251
252 unsigned int total_tx_bytes; 252 unsigned int total_tx_bytes;
253 unsigned int total_tx_packets; 253 unsigned int total_tx_packets;
254 unsigned int total_rx_bytes; 254 unsigned int total_rx_bytes;
@@ -311,8 +311,8 @@ struct igb_adapter {
311 u32 eeprom_wol; 311 u32 eeprom_wol;
312 312
313 struct igb_ring *multi_tx_table[IGB_ABS_MAX_TX_QUEUES]; 313 struct igb_ring *multi_tx_table[IGB_ABS_MAX_TX_QUEUES];
314 unsigned int tx_ring_count; 314 u16 tx_ring_count;
315 unsigned int rx_ring_count; 315 u16 rx_ring_count;
316 unsigned int vfs_allocated_count; 316 unsigned int vfs_allocated_count;
317 struct vf_data_storage *vf_data; 317 struct vf_data_storage *vf_data;
318}; 318};