]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
skge: receive flush logic
authorStephen Hemminger <shemminger@linux-foundation.org>
Mon, 26 Nov 2007 19:54:49 +0000 (11:54 -0800)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Dec 2007 21:32:29 +0000 (16:32 -0500)
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>
drivers/net/skge.c

index 14f06aea9ca04b88ebb47f020262bf5779e0d7d1..82edf44b9e2a9df0c792b8d9b4d91fb2eb63cdb9 100644 (file)
@@ -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);