diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/forcedeth.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 87757c89caef..81722fb51a36 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -1013,10 +1013,8 @@ static void free_rings(struct net_device *dev) | |||
1013 | pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (np->rx_ring_size + np->tx_ring_size), | 1013 | pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (np->rx_ring_size + np->tx_ring_size), |
1014 | np->rx_ring.ex, np->ring_addr); | 1014 | np->rx_ring.ex, np->ring_addr); |
1015 | } | 1015 | } |
1016 | if (np->rx_skb) | 1016 | kfree(np->rx_skb); |
1017 | kfree(np->rx_skb); | 1017 | kfree(np->tx_skb); |
1018 | if (np->tx_skb) | ||
1019 | kfree(np->tx_skb); | ||
1020 | } | 1018 | } |
1021 | 1019 | ||
1022 | static int using_multi_irqs(struct net_device *dev) | 1020 | 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 | |||
4442 | pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending), | 4440 | pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending), |
4443 | rxtx_ring, ring_addr); | 4441 | rxtx_ring, ring_addr); |
4444 | } | 4442 | } |
4445 | if (rx_skbuff) | 4443 | |
4446 | kfree(rx_skbuff); | 4444 | kfree(rx_skbuff); |
4447 | if (tx_skbuff) | 4445 | kfree(tx_skbuff); |
4448 | kfree(tx_skbuff); | ||
4449 | goto exit; | 4446 | goto exit; |
4450 | } | 4447 | } |
4451 | 4448 | ||