diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-07 22:33:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-07 22:33:56 -0500 |
| commit | 81ebd4988892869260808286641a5400aafcb3d1 (patch) | |
| tree | fb6e1fc86dc03213761badfdd0f8ac57c36725e4 /drivers/net/ixgb/ixgb.h | |
| parent | bf81b46482c0fa8ea638e409d39768ea92a6b0f0 (diff) | |
| parent | a3ffab87588234e41248d8cebd8cec88db605d3c (diff) | |
Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/ixgb/ixgb.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index 50ffe90488ff..f4aba4355b19 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h | |||
| @@ -171,6 +171,7 @@ struct ixgb_adapter { | |||
| 171 | 171 | ||
| 172 | /* TX */ | 172 | /* TX */ |
| 173 | struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp; | 173 | struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp; |
| 174 | unsigned int restart_queue; | ||
| 174 | unsigned long timeo_start; | 175 | unsigned long timeo_start; |
| 175 | uint32_t tx_cmd_type; | 176 | uint32_t tx_cmd_type; |
| 176 | uint64_t hw_csum_tx_good; | 177 | uint64_t hw_csum_tx_good; |