From 8571c23c05ca57df0b5bd80156600ba9c0a4481a Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Wed, 3 Feb 2010 08:31:12 +0000
Subject: [PATCH] --- yaml --- r: 183830 b: refs/heads/master c:
 90c30335a70e96b8b8493b7deb15e6b30e6d9fce h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5f8d5830b66f..146d1ae5edf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fbd9187d004149fb8a98c9cb51ef9f4a4f66aca
+refs/heads/master: 90c30335a70e96b8b8493b7deb15e6b30e6d9fce
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 72c92495a9b3..744362272e2d 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2404,6 +2404,9 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
 		skb = receive_copy(sky2, re, length);
 	else
 		skb = receive_new(sky2, re, length);
+
+	dev->stats.rx_dropped += (skb == NULL);
+
 resubmit:
 	sky2_rx_submit(sky2, re);
 
@@ -2515,11 +2518,10 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
 		case OP_RXSTAT:
 			total_packets[port]++;
 			total_bytes[port] += length;
+
 			skb = sky2_receive(dev, length, status);
-			if (unlikely(!skb)) {
-				dev->stats.rx_dropped++;
+			if (!skb)
 				break;
-			}
 
 			/* This chip reports checksum status differently */
 			if (hw->flags & SKY2_HW_NEW_LE) {