Re: [PATCH] net: lpc_eth: fix tx completion

Roland Stigge
2012-06-11T18:58:46Z

On 11/06/12 19:21, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> __lpc_handle_xmit() has two bugs :
>
> 1) It can leak skbs in case TXSTATUS_ERROR is set
>
> 2) It can wake up txqueue while no slot was freed.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Reported-by: Roland Stigge <stigge@antcom.de>
> Tested-by: Roland Stigge <stigge@antcom.de>
> Cc: Kevin Wells <kevin.wells@nxp.com>

Thanks!

Would be good for v3.5 and for stable v3.4 also.

> ---
> drivers/net/ethernet/nxp/lpc_eth.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
> index 8d2666f..ff76c21 100644
> --- a/drivers/net/ethernet/nxp/lpc_eth.c
> +++ b/drivers/net/ethernet/nxp/lpc_eth.c
> @@ -946,16 +946,16 @@ static void __lpc_handle_xmit(struct net_device *ndev)
> /* Update stats */
> ndev->stats.tx_packets++;
> ndev->stats.tx_bytes += skb->len;
> -
> - /* Free buffer */
> - dev_kfree_skb_irq(skb);
> }
> + dev_kfree_skb_irq(skb);
>
> txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
> }
>
> - if (netif_queue_stopped(ndev))
> - netif_wake_queue(ndev);
> + if (pldat->num_used_tx_buffs <= ENET_TX_DESC/2) {
> + if (netif_queue_stopped(ndev))
> + netif_wake_queue(ndev);
> + }
> }
>
> static int __lpc_handle_recv(struct net_device *ndev, int budget)
>