From c97ebfa61a6b9ce3f630bbf09ddd2f7ba701ebc7 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sat, 27 Nov 2010 08:39:44 +0000
Subject: [PATCH] --- yaml --- r: 224531 b: refs/heads/master c:
 9b03b06b65856f70564c53654d44053f3072379e h: refs/heads/master i:   224529:
 2cece1619f13a1318ac9ec134328696b33c2bc8a   224527:
 0361065605f804cedc1691b78cc2e2c13cb44fee v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/forcedeth.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2f48427aa272..44805e534d87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9
+refs/heads/master: 9b03b06b65856f70564c53654d44053f3072379e
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
index 87757c89caef..81722fb51a36 100644
--- a/trunk/drivers/net/forcedeth.c
+++ b/trunk/drivers/net/forcedeth.c
@@ -1013,10 +1013,8 @@ static void free_rings(struct net_device *dev)
 			pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (np->rx_ring_size + np->tx_ring_size),
 					    np->rx_ring.ex, np->ring_addr);
 	}
-	if (np->rx_skb)
-		kfree(np->rx_skb);
-	if (np->tx_skb)
-		kfree(np->tx_skb);
+	kfree(np->rx_skb);
+	kfree(np->tx_skb);
 }
 
 static int using_multi_irqs(struct net_device *dev)
@@ -4442,10 +4440,9 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
 				pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending),
 						    rxtx_ring, ring_addr);
 		}
-		if (rx_skbuff)
-			kfree(rx_skbuff);
-		if (tx_skbuff)
-			kfree(tx_skbuff);
+
+		kfree(rx_skbuff);
+		kfree(tx_skbuff);
 		goto exit;
 	}