[PATCH CFT 12/30] net: fec: ensure fec_enet_free_buffers() properly cleans the rings
Sergei Shtylyov
sergei.shtylyov at cogentembedded.com
Fri Jun 27 11:48:42 PDT 2014
Hello.
On 06/27/2014 07:19 PM, Russell King wrote:
> Ensure that we do not double-free any allocations, and that any transmit
> skbuffs are properly freed when we clean up the rings.
> Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
> ---
> drivers/net/ethernet/freescale/fec_main.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 9c5570a3e32e..8024b7a8e7f4 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -2079,8 +2079,14 @@ 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;
> + if (skb)
> + dev_kfree_skb(skb);
dev_kfree_skb() (actually, consume_skb() that it calls) already checks
'skb' for NULL.
WBR, Sergei
More information about the linux-arm-kernel
mailing list