summaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-11-26 11:54:49 -0800
committerJeff Garzik <jeff@garzik.org>2007-12-01 16:32:29 -0500
commitd08b9bdf0264a8134677373f97641712062c603f (patch)
tree5305e46e983292b9271050c9c02a2a1551ab0e00 /drivers/net/skge.c
parent29816d9aa55c99d463bd5507a46535b5fe79c33a (diff)
downloadblackbird-op-linux-d08b9bdf0264a8134677373f97641712062c603f.tar.gz
blackbird-op-linux-d08b9bdf0264a8134677373f97641712062c603f.zip
skge: receive flush logic
Receive FIFO overrun is not catastrophic condition, so don't flush when it happens. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 14f06aea9ca0..82edf44b9e2a 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -1801,11 +1801,6 @@ static void genesis_mac_intr(struct skge_hw *hw, int port)
xm_write32(hw, port, XM_MODE, XM_MD_FTF);
++dev->stats.tx_fifo_errors;
}
-
- if (status & XM_IS_RXF_OV) {
- xm_write32(hw, port, XM_MODE, XM_MD_FRF);
- ++dev->stats.rx_fifo_errors;
- }
}
static void genesis_link_up(struct skge_port *skge)
@@ -1862,9 +1857,9 @@ static void genesis_link_up(struct skge_port *skge)
xm_write32(hw, port, XM_MODE, mode);
- /* Turn on detection of Tx underrun, Rx overrun */
+ /* Turn on detection of Tx underrun */
msk = xm_read16(hw, port, XM_IMSK);
- msk &= ~(XM_IS_RXF_OV | XM_IS_TXF_UR);
+ msk &= ~XM_IS_TXF_UR;
xm_write16(hw, port, XM_IMSK, msk);
xm_read16(hw, port, XM_ISRC);
OpenPOWER on IntegriCloud