From 634bb432276f24159c1c3b6434fdf4d531a0fb81 Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@freescale.com>
Date: Wed, 17 Dec 2008 16:50:22 -0800
Subject: [PATCH] --- yaml --- r: 122759 b: refs/heads/master c:
 8882d9a60028a9937e9c5652cfb80d4399ce5242 h: refs/heads/master i:   122757:
 b47d557397fb80b875246bf208b41533f7b4c0a6   122755:
 dfd9263b59e29ff94086e5efa2c2dbd70386ca23   122751:
 6daa3d51d7075525f05f5211545e144444ae1142 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/gianfar.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d74258b858a6..c36172482ae2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a693722aec4ce26fb46c21cf4bf4422484a397a7
+refs/heads/master: 8882d9a60028a9937e9c5652cfb80d4399ce5242
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index 3e611a69df13..a6efabc28dc8 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -1732,8 +1732,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
 
 			if (unlikely(!newskb))
 				newskb = skb;
-
-			if (skb)
+			else if (skb)
 				dev_kfree_skb_any(skb);
 		} else {
 			/* Increment the number of packets */