aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-10-17 13:24:16 -0400
committerStephen Hemminger <shemminger@osdl.org>2006-10-17 13:24:16 -0400
commitb6d7773462df13c105c19ab89706687ded839844 (patch)
treee3202eedceee73389818767ce9eb7a80f0b5b63d
parent16ad91e1c686734aaa5664cd08af0b5e9bf3af61 (diff)
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>
-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:
2014 2014
2015error: 2015error:
2016 ++sky2->net_stats.rx_errors; 2016 ++sky2->net_stats.rx_errors;
2017 if (status & GMR_FS_RX_FF_OV) {
2018 sky2->net_stats.rx_fifo_errors++;
2019 goto resubmit;
2020 }
2017 2021
2018 if (netif_msg_rx_err(sky2) && net_ratelimit()) 2022 if (netif_msg_rx_err(sky2) && net_ratelimit())
2019 printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n", 2023 printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n",
@@ -2025,8 +2029,6 @@ error:
2025 sky2->net_stats.rx_frame_errors++; 2029 sky2->net_stats.rx_frame_errors++;
2026 if (status & GMR_FS_CRC_ERR) 2030 if (status & GMR_FS_CRC_ERR)
2027 sky2->net_stats.rx_crc_errors++; 2031 sky2->net_stats.rx_crc_errors++;
2028 if (status & GMR_FS_RX_FF_OV)
2029 sky2->net_stats.rx_fifo_errors++;
2030 2032
2031 goto resubmit; 2033 goto resubmit;
2032} 2034}