From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091Ab2FKS6q (ORCPT ); Mon, 11 Jun 2012 14:58:46 -0400 Received: from antcom.de ([188.40.178.216]:44222 "EHLO chuck.antcom.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933Ab2FKS6p (ORCPT ); Mon, 11 Jun 2012 14:58:45 -0400 Message-ID: <4FD63FE0.9020609@antcom.de> Date: Mon, 11 Jun 2012 20:58:40 +0200 From: Roland Stigge Organization: ANTCOM Open Source Research and Development User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:10.0.3) Gecko/20120329 Icedove/10.0.3 MIME-Version: 1.0 To: Eric Dumazet CC: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kevin.wells@nxp.com, srinivas.bakki@nxp.com, aletes.xgr@gmail.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] net: lpc_eth: fix tx completion 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> In-Reply-To: <1339435296.6001.2484.camel@edumazet-glaptop> X-Enigmail-Version: 1.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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) >