aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale/fec_main.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-07-07 19:23:25 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-08 00:21:22 -0400
commit8b7c9efa018f96e58fa379ddb8c03f002c4f6a84 (patch)
treea9178fea7f183eed1a35511cee389d15b8a203a8 /drivers/net/ethernet/freescale/fec_main.c
parentd6bf31431b533629ad65feb954c29bbf5696e490 (diff)
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.c7
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)
2079 } 2079 }
2080 2080
2081 bdp = fep->tx_bd_base; 2081 bdp = fep->tx_bd_base;
2082 for (i = 0; i < fep->tx_ring_size; i++) 2082 for (i = 0; i < fep->tx_ring_size; i++) {
2083 kfree(fep->tx_bounce[i]); 2083 kfree(fep->tx_bounce[i]);
2084 fep->tx_bounce[i] = NULL;
2085 skb = fep->tx_skbuff[i];
2086 fep->tx_skbuff[i] = NULL;
2087 dev_kfree_skb(skb);
2088 }
2084} 2089}
2085 2090
2086static int fec_enet_alloc_buffers(struct net_device *ndev) 2091static int fec_enet_alloc_buffers(struct net_device *ndev)