diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-10-27 11:52:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-28 04:20:29 -0400 |
commit | 04a5fcaaf0e12d066411aa54e42591952aa18da7 (patch) | |
tree | e528d31a9aef81301340a9ef2d6367b2832ab2e7 /drivers/net/igb/igb.h | |
parent | 4c844851d15cc08d995179ab5118172711be6eb0 (diff) |
igb: move alloc_failed and csum_err stats into per rx-ring stat
The allocation failed and checksum error stats are currently kept as a
global stat. If we end up allocating the queues to multiple netdevs then
the global counter doesn't make much sense. For this reason I felt it
necessary to move the alloc_rx_buff_failed stat into the rx_stats
portion of the rx_ring.
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/net/igb/igb.h')
-rw-r--r-- | drivers/net/igb/igb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index 00ff274b16db..6a67fa2e6007 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h | |||
@@ -145,12 +145,15 @@ struct igb_buffer { | |||
145 | struct igb_tx_queue_stats { | 145 | struct igb_tx_queue_stats { |
146 | u64 packets; | 146 | u64 packets; |
147 | u64 bytes; | 147 | u64 bytes; |
148 | u64 restart_queue; | ||
148 | }; | 149 | }; |
149 | 150 | ||
150 | struct igb_rx_queue_stats { | 151 | struct igb_rx_queue_stats { |
151 | u64 packets; | 152 | u64 packets; |
152 | u64 bytes; | 153 | u64 bytes; |
153 | u64 drops; | 154 | u64 drops; |
155 | u64 csum_err; | ||
156 | u64 alloc_failed; | ||
154 | }; | 157 | }; |
155 | 158 | ||
156 | struct igb_q_vector { | 159 | struct igb_q_vector { |
@@ -241,7 +244,6 @@ struct igb_adapter { | |||
241 | 244 | ||
242 | /* TX */ | 245 | /* TX */ |
243 | struct igb_ring *tx_ring; /* One per active queue */ | 246 | struct igb_ring *tx_ring; /* One per active queue */ |
244 | unsigned int restart_queue; | ||
245 | unsigned long tx_queue_len; | 247 | unsigned long tx_queue_len; |
246 | u32 txd_cmd; | 248 | u32 txd_cmd; |
247 | u32 gotc; | 249 | u32 gotc; |
@@ -255,8 +257,6 @@ struct igb_adapter { | |||
255 | int num_tx_queues; | 257 | int num_tx_queues; |
256 | int num_rx_queues; | 258 | int num_rx_queues; |
257 | 259 | ||
258 | u64 hw_csum_err; | ||
259 | u32 alloc_rx_buff_failed; | ||
260 | u32 gorc; | 260 | u32 gorc; |
261 | u64 gorc_old; | 261 | u64 gorc_old; |
262 | u32 max_frame_size; | 262 | u32 max_frame_size; |