diff --git a/[refs] b/[refs]
index ebddafa42baa..e00d9cb55e6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16ad91e1c686734aaa5664cd08af0b5e9bf3af61
+refs/heads/master: b6d7773462df13c105c19ab89706687ded839844
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index b8f202169a75..6eddd0f36bc0 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2014,6 +2014,10 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 
 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 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 		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;
 }