---

yaml --- r: 122759 b: refs/heads/master c: 8882d9a h: refs/heads/master i: 122757: b47d557 122755: dfd9263 122751: 6daa3d5 v: v3
git-mirror · Dec 18, 2008 · 634bb43 · 634bb43
1 parent 4fc2486
commit 634bb43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 */