diff options
Diffstat (limited to 'drivers/net/igb/igb.h')
-rw-r--r-- | drivers/net/igb/igb.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index 2c48eec17660..a1431c8797b9 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h | |||
@@ -62,6 +62,7 @@ struct igb_adapter; | |||
62 | 62 | ||
63 | /* Transmit and receive queues */ | 63 | /* Transmit and receive queues */ |
64 | #define IGB_MAX_RX_QUEUES 4 | 64 | #define IGB_MAX_RX_QUEUES 4 |
65 | #define IGB_MAX_TX_QUEUES 4 | ||
65 | 66 | ||
66 | /* RX descriptor control thresholds. | 67 | /* RX descriptor control thresholds. |
67 | * PTHRESH - MAC will consider prefetch if it has fewer than this number of | 68 | * PTHRESH - MAC will consider prefetch if it has fewer than this number of |
@@ -157,8 +158,6 @@ struct igb_ring { | |||
157 | union { | 158 | union { |
158 | /* TX */ | 159 | /* TX */ |
159 | struct { | 160 | struct { |
160 | spinlock_t tx_clean_lock; | ||
161 | spinlock_t tx_lock; | ||
162 | bool detect_tx_hung; | 161 | bool detect_tx_hung; |
163 | }; | 162 | }; |
164 | /* RX */ | 163 | /* RX */ |
@@ -277,6 +276,10 @@ struct igb_adapter { | |||
277 | /* for ioport free */ | 276 | /* for ioport free */ |
278 | int bars; | 277 | int bars; |
279 | int need_ioport; | 278 | int need_ioport; |
279 | |||
280 | #ifdef CONFIG_NETDEVICES_MULTIQUEUE | ||
281 | struct igb_ring *multi_tx_table[IGB_MAX_TX_QUEUES]; | ||
282 | #endif /* CONFIG_NETDEVICES_MULTIQUEUE */ | ||
280 | }; | 283 | }; |
281 | 284 | ||
282 | enum e1000_state_t { | 285 | enum e1000_state_t { |