diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-08 00:23:25 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-07-07 21:21:22 -0700 |
| commit | 8b7c9efa018f96e58fa379ddb8c03f002c4f6a84 (patch) | |
| tree | a9178fea7f183eed1a35511cee389d15b8a203a8 /drivers/net/ethernet/freescale/fec_main.c | |
| parent | net: fec: clean up transmit descriptor setup (diff) | |
| download | linux-dev-8b7c9efa018f96e58fa379ddb8c03f002c4f6a84.tar.xz linux-dev-8b7c9efa018f96e58fa379ddb8c03f002c4f6a84.zip | |
net: fec: ensure fec_enet_free_buffers() properly cleans the rings
Ensure that we do not double-free any allocations, and that any transmit
skbuffs are properly freed when we clean up the rings.
Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 9c5570a3e32e..5499bd8ad0a5 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2079,8 +2079,13 @@ static void fec_enet_free_buffers(struct net_device *ndev) } bdp = fep->tx_bd_base; - for (i = 0; i < fep->tx_ring_size; i++) + for (i = 0; i < fep->tx_ring_size; i++) { kfree(fep->tx_bounce[i]); + fep->tx_bounce[i] = NULL; + skb = fep->tx_skbuff[i]; + fep->tx_skbuff[i] = NULL; + dev_kfree_skb(skb); + } } static int fec_enet_alloc_buffers(struct net_device *ndev) |