skge: receive flush logic

[linux-2.6-omap-h63xx.git] / drivers / net / skge.c

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 6d62250fba07944fab02a67dc9b93dc6fcdf36de..82edf44b9e2a9df0c792b8d9b4d91fb2eb63cdb9 100644 (file)
--- 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);
@@ -2619,8 +2614,8 @@ static int skge_up(struct net_device *dev)
                yukon_mac_init(hw, port);
        spin_unlock_bh(&hw->phy_lock);
 
-       /* Configure RAMbuffers */
-       chunk = hw->ram_size / ((hw->ports + 1)*2);
+       /* Configure RAMbuffers - equally between ports and tx/rx */
+       chunk = (hw->ram_size  - hw->ram_offset) / (hw->ports * 2);
        ram_addr = hw->ram_offset + 2 * chunk * port;
 
        skge_ramset(hw, rxqaddr[port], ram_addr, chunk);