diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-09-09 12:54:56 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:32:07 -0400 |
| commit | 46a60f2d718d56bba8695d6f1145eb40548d86f8 (patch) | |
| tree | 2d4ef2035baac15a36dbad636ac84922c021f97f /drivers/net/skge.h | |
| parent | c535a9dd26d1a4c6dcbd486cbe181a9e71237af1 (diff) | |
| download | linux-46a60f2d718d56bba8695d6f1145eb40548d86f8.tar.bz2 | |
[PATCH] skge: gmac register access errors in dual port
Merge of four previous patches and the Kconfig fix
* Remove debug printk's
* whitespace cleanup and version number change
* clear interrupts, reset phy, and reset hardware on shutdown
* ignore 64bit counter overflow interrupts
* fix a couple of places where second port could clobber state
of first port.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/skge.h')
| -rw-r--r-- | drivers/net/skge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index f1680beb8e68..efbf98c675d2 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h @@ -2008,7 +2008,7 @@ enum { GM_IS_RX_FF_OR = 1<<1, /* Receive FIFO Overrun */ GM_IS_RX_COMPL = 1<<0, /* Frame Reception Complete */ -#define GMAC_DEF_MSK (GM_IS_TX_CO_OV | GM_IS_RX_CO_OV | GM_IS_TX_FF_UR) +#define GMAC_DEF_MSK (GM_IS_RX_FF_OR | GM_IS_TX_FF_UR) /* GMAC_LINK_CTRL 16 bit GMAC Link Control Reg (YUKON only) */ /* Bits 15.. 2: reserved */ |