diff options
-rw-r--r-- | drivers/net/spider_net.c | 2 | ||||
-rw-r--r-- | drivers/net/spider_net.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 9dd282346e1c..cef7e6671c49 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1633,7 +1633,7 @@ spider_net_enable_card(struct spider_net_card *card) | |||
1633 | SPIDER_NET_INT2_MASK_VALUE); | 1633 | SPIDER_NET_INT2_MASK_VALUE); |
1634 | 1634 | ||
1635 | spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR, | 1635 | spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR, |
1636 | SPIDER_NET_GDTBSTA | SPIDER_NET_GDTDCEIDIS); | 1636 | SPIDER_NET_GDTBSTA); |
1637 | } | 1637 | } |
1638 | 1638 | ||
1639 | /** | 1639 | /** |
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index cb85cbb3d92d..3e196df29790 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef _SPIDER_NET_H | 24 | #ifndef _SPIDER_NET_H |
25 | #define _SPIDER_NET_H | 25 | #define _SPIDER_NET_H |
26 | 26 | ||
27 | #define VERSION "1.5 A" | 27 | #define VERSION "1.6 A" |
28 | 28 | ||
29 | #include "sungem_phy.h" | 29 | #include "sungem_phy.h" |
30 | 30 | ||
@@ -217,8 +217,7 @@ extern char spider_net_driver_name[]; | |||
217 | #define SPIDER_NET_GDTBSTA 0x00000300 | 217 | #define SPIDER_NET_GDTBSTA 0x00000300 |
218 | #define SPIDER_NET_GDTDCEIDIS 0x00000002 | 218 | #define SPIDER_NET_GDTDCEIDIS 0x00000002 |
219 | #define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \ | 219 | #define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \ |
220 | SPIDER_NET_GDTBSTA | \ | 220 | SPIDER_NET_GDTBSTA |
221 | SPIDER_NET_GDTDCEIDIS | ||
222 | 221 | ||
223 | #define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003 | 222 | #define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003 |
224 | 223 | ||
@@ -328,7 +327,8 @@ enum spider_net_int2_status { | |||
328 | SPIDER_NET_GRISPDNGINT | 327 | SPIDER_NET_GRISPDNGINT |
329 | }; | 328 | }; |
330 | 329 | ||
331 | #define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) ) | 330 | #define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) | \ |
331 | (1 << SPIDER_NET_GDTDCEINT) ) | ||
332 | 332 | ||
333 | /* We rely on flagged descriptor interrupts */ | 333 | /* We rely on flagged descriptor interrupts */ |
334 | #define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) ) | 334 | #define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) ) |