diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-31 17:39:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-31 17:39:21 -0400 |
| commit | 7c440e7990ea22c0c374c59a5fbd79b0579d1517 (patch) | |
| tree | 4fa6513ee2740479bf9c2796a3911eefa485572b /drivers/net/ixgb/ixgb.h | |
| parent | a422142cfdf90d889d8d3e2affb8311a381530b7 (diff) | |
| parent | 9ee093f653bae98cb56b0669819d4bccb8c05fa4 (diff) | |
| download | linux-next-7c440e7990ea22c0c374c59a5fbd79b0579d1517.tar.gz | |
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream
Diffstat (limited to 'drivers/net/ixgb/ixgb.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index 82b67af54c94..a51604b3651f 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h @@ -110,9 +110,6 @@ struct ixgb_adapter; #define IXGB_RXBUFFER_8192 8192 #define IXGB_RXBUFFER_16384 16384 -/* How many Tx Descriptors do we need to call netif_wake_queue? */ -#define IXGB_TX_QUEUE_WAKE 16 - /* How many Rx Buffers do we bundle into one write to the hardware ? */ #define IXGB_RX_BUFFER_WRITE 4 /* Must be power of 2 */ @@ -173,7 +170,7 @@ struct ixgb_adapter { unsigned long led_status; /* TX */ - struct ixgb_desc_ring tx_ring; + struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp; unsigned long timeo_start; uint32_t tx_cmd_type; uint64_t hw_csum_tx_good; |