From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 17 Oct 2006 17:24:16 +0000 (-0700)
Subject: sky2: no message on rx fifo overflow
X-Git-Tag: v2.6.19-rc3~143
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6d7773462df13c105c19ab89706687ded839844;p=linux-2.6

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>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index b8f202169a..6eddd0f36b 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;
 }