From mboxrd@z Thu Jan 1 00:00:00 1970 From: stigge@antcom.de (Roland Stigge) Date: Mon, 11 Jun 2012 20:58:40 +0200 Subject: [PATCH] net: lpc_eth: fix tx completion In-Reply-To: <1339435296.6001.2484.camel@edumazet-glaptop> References: <1339401793-12258-1-git-send-email-stigge@antcom.de> <1339403108.6001.1697.camel@edumazet-glaptop> <4FD5AE1D.9030807@antcom.de> <1339404835.6001.1788.camel@edumazet-glaptop> <1339435296.6001.2484.camel@edumazet-glaptop> Message-ID: <4FD63FE0.9020609@antcom.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 11/06/12 19:21, Eric Dumazet wrote: > From: Eric Dumazet > > __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 > Reported-by: Roland Stigge > Tested-by: Roland Stigge > Cc: Kevin Wells 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) >