summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-10-17 10:24:16 -0700
committerStephen Hemminger <shemminger@osdl.org>2006-10-17 10:24:16 -0700
commitb6d7773462df13c105c19ab89706687ded839844 (patch)
treee3202eedceee73389818767ce9eb7a80f0b5b63d /drivers/net
parent16ad91e1c686734aaa5664cd08af0b5e9bf3af61 (diff)
downloadblackbird-op-linux-b6d7773462df13c105c19ab89706687ded839844.tar.gz
blackbird-op-linux-b6d7773462df13c105c19ab89706687ded839844.zip
sky2: no message on rx fifo overflow
Under high load it is possible to make the receiver FIFO get overloaded. The driver/hardware recover properly, so there is no reason to fill the log with lots of extra messages, just update counter. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sky2.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index b8f202169a75..6eddd0f36bc0 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2014,6 +2014,10 @@ oversize:
error:
++sky2->net_stats.rx_errors;
+ if (status & GMR_FS_RX_FF_OV) {
+ sky2->net_stats.rx_fifo_errors++;
+ goto resubmit;
+ }
if (netif_msg_rx_err(sky2) && net_ratelimit())
printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n",
@@ -2025,8 +2029,6 @@ error:
sky2->net_stats.rx_frame_errors++;
if (status & GMR_FS_CRC_ERR)
sky2->net_stats.rx_crc_errors++;
- if (status & GMR_FS_RX_FF_OV)
- sky2->net_stats.rx_fifo_errors++;
goto resubmit;
}
OpenPOWER on IntegriCloud