diff options
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_int.h')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 35418146fa17..a03f358fd58b 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h | |||
@@ -70,10 +70,10 @@ | |||
70 | /* | 70 | /* |
71 | * Version numbers | 71 | * Version numbers |
72 | */ | 72 | */ |
73 | #define VMXNET3_DRIVER_VERSION_STRING "1.1.30.0-k" | 73 | #define VMXNET3_DRIVER_VERSION_STRING "1.2.0.0-k" |
74 | 74 | ||
75 | /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ | 75 | /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ |
76 | #define VMXNET3_DRIVER_VERSION_NUM 0x01011E00 | 76 | #define VMXNET3_DRIVER_VERSION_NUM 0x01020000 |
77 | 77 | ||
78 | #if defined(CONFIG_PCI_MSI) | 78 | #if defined(CONFIG_PCI_MSI) |
79 | /* RSS only makes sense if MSI-X is supported. */ | 79 | /* RSS only makes sense if MSI-X is supported. */ |
@@ -229,6 +229,7 @@ struct vmxnet3_tx_queue { | |||
229 | spinlock_t tx_lock; | 229 | spinlock_t tx_lock; |
230 | struct vmxnet3_cmd_ring tx_ring; | 230 | struct vmxnet3_cmd_ring tx_ring; |
231 | struct vmxnet3_tx_buf_info *buf_info; | 231 | struct vmxnet3_tx_buf_info *buf_info; |
232 | dma_addr_t buf_info_pa; | ||
232 | struct vmxnet3_tx_data_ring data_ring; | 233 | struct vmxnet3_tx_data_ring data_ring; |
233 | struct vmxnet3_comp_ring comp_ring; | 234 | struct vmxnet3_comp_ring comp_ring; |
234 | struct Vmxnet3_TxQueueCtrl *shared; | 235 | struct Vmxnet3_TxQueueCtrl *shared; |
@@ -277,6 +278,7 @@ struct vmxnet3_rx_queue { | |||
277 | u32 qid; /* rqID in RCD for buffer from 1st ring */ | 278 | u32 qid; /* rqID in RCD for buffer from 1st ring */ |
278 | u32 qid2; /* rqID in RCD for buffer from 2nd ring */ | 279 | u32 qid2; /* rqID in RCD for buffer from 2nd ring */ |
279 | struct vmxnet3_rx_buf_info *buf_info[2]; | 280 | struct vmxnet3_rx_buf_info *buf_info[2]; |
281 | dma_addr_t buf_info_pa; | ||
280 | struct Vmxnet3_RxQueueCtrl *shared; | 282 | struct Vmxnet3_RxQueueCtrl *shared; |
281 | struct vmxnet3_rq_driver_stats stats; | 283 | struct vmxnet3_rq_driver_stats stats; |
282 | } __attribute__((__aligned__(SMP_CACHE_BYTES))); | 284 | } __attribute__((__aligned__(SMP_CACHE_BYTES))); |
@@ -353,6 +355,10 @@ struct vmxnet3_adapter { | |||
353 | unsigned long state; /* VMXNET3_STATE_BIT_xxx */ | 355 | unsigned long state; /* VMXNET3_STATE_BIT_xxx */ |
354 | 356 | ||
355 | int share_intr; | 357 | int share_intr; |
358 | |||
359 | dma_addr_t adapter_pa; | ||
360 | dma_addr_t pm_conf_pa; | ||
361 | dma_addr_t rss_conf_pa; | ||
356 | }; | 362 | }; |
357 | 363 | ||
358 | #define VMXNET3_WRITE_BAR0_REG(adapter, reg, val) \ | 364 | #define VMXNET3_WRITE_BAR0_REG(adapter, reg, val) \ |