diff options
Diffstat (limited to 'drivers/net/spider_net.h')
-rw-r--r-- | drivers/net/spider_net.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index 4a1e0d28a502..1d054aa71504 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _SPIDER_NET_H | 25 | #ifndef _SPIDER_NET_H |
26 | #define _SPIDER_NET_H | 26 | #define _SPIDER_NET_H |
27 | 27 | ||
28 | #define VERSION "2.0 A" | 28 | #define VERSION "2.0 B" |
29 | 29 | ||
30 | #include "sungem_phy.h" | 30 | #include "sungem_phy.h" |
31 | 31 | ||
@@ -222,6 +222,7 @@ extern char spider_net_driver_name[]; | |||
222 | #define SPIDER_NET_GDTBSTA 0x00000300 | 222 | #define SPIDER_NET_GDTBSTA 0x00000300 |
223 | #define SPIDER_NET_GDTDCEIDIS 0x00000002 | 223 | #define SPIDER_NET_GDTDCEIDIS 0x00000002 |
224 | #define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \ | 224 | #define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \ |
225 | SPIDER_NET_GDTDCEIDIS | \ | ||
225 | SPIDER_NET_GDTBSTA | 226 | SPIDER_NET_GDTBSTA |
226 | 227 | ||
227 | #define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003 | 228 | #define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003 |
@@ -332,8 +333,7 @@ enum spider_net_int2_status { | |||
332 | SPIDER_NET_GRISPDNGINT | 333 | SPIDER_NET_GRISPDNGINT |
333 | }; | 334 | }; |
334 | 335 | ||
335 | #define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) | \ | 336 | #define SPIDER_NET_TXINT (1 << SPIDER_NET_GDTFDCINT) |
336 | (1 << SPIDER_NET_GDTDCEINT) ) | ||
337 | 337 | ||
338 | /* We rely on flagged descriptor interrupts */ | 338 | /* We rely on flagged descriptor interrupts */ |
339 | #define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) ) | 339 | #define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) ) |
@@ -461,6 +461,8 @@ struct spider_net_card { | |||
461 | struct work_struct tx_timeout_task; | 461 | struct work_struct tx_timeout_task; |
462 | atomic_t tx_timeout_task_counter; | 462 | atomic_t tx_timeout_task_counter; |
463 | wait_queue_head_t waitq; | 463 | wait_queue_head_t waitq; |
464 | int num_rx_ints; | ||
465 | int ignore_rx_ramfull; | ||
464 | 466 | ||
465 | /* for ethtool */ | 467 | /* for ethtool */ |
466 | int msg_enable; | 468 | int msg_enable; |