Skip to content

Commit

Permalink
forcedeth: remove unnecessary checks before kfree
Browse files Browse the repository at this point in the history
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Szymon Janc authored and David S. Miller committed Nov 29, 2010
1 parent 78aea4f commit 9b03b06
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/net/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 9b03b06

Please sign in to comment.