From 7285f90d96a16170c70a4f9aa773afa252a6bb2d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 26 Nov 2007 11:54:49 -0800 Subject: [PATCH] --- yaml --- r: 74470 b: refs/heads/master c: d08b9bdf0264a8134677373f97641712062c603f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index accc51126a45..c1095d3f99f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29816d9aa55c99d463bd5507a46535b5fe79c33a +refs/heads/master: d08b9bdf0264a8134677373f97641712062c603f diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 14f06aea9ca0..82edf44b9e2a 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/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);