From: Stephen Hemminger Date: Mon, 26 Nov 2007 19:54:49 +0000 (-0800) Subject: skge: receive flush logic X-Git-Tag: v2.6.24-rc4~9^2~21 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d08b9bdf0264a8134677373f97641712062c603f;p=linux-2.6-omap-h63xx.git skge: receive flush logic Receive FIFO overrun is not catastrophic condition, so don't flush when it happens. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 14f06aea9ca..82edf44b9e2 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);