lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forcedeth: remove unnecessary checks before kfree

Browse Source 
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Szymon Janc
2010-11-27 08:39:44 +00:00
committed by David S. Miller
parent 78aea4fc67
commit 9b03b06b65
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/forcedeth.c
View File

@@ -1013,9 +1013,7 @@ 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), 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); np->rx_ring.ex, np->ring_addr);
} }
if (np->rx_skb)
kfree(np->rx_skb); kfree(np->rx_skb);
if (np->tx_skb)
kfree(np->tx_skb); kfree(np->tx_skb);
} }
@@ -4442,9 +4440,8 @@ 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), pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending),
rxtx_ring, ring_addr); rxtx_ring, ring_addr);
} }
if (rx_skbuff)
kfree(rx_skbuff); kfree(rx_skbuff);
if (tx_skbuff)
kfree(tx_skbuff); kfree(tx_skbuff);
goto exit; goto exit;
} }