From: Eric Dumazet <eric.dumazet@gmail.com>
To: Roland Stigge <stigge@antcom.de>
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: [PATCH] net: lpc_eth: fix tx completion
Date: Mon, 11 Jun 2012 19:21:36 +0200 [thread overview]
Message-ID: <1339435296.6001.2484.camel@edumazet-glaptop> (raw)
In-Reply-To: <1339404835.6001.1788.camel@edumazet-glaptop>
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>
---
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)
next prev parent reply other threads:[~2012-06-11 17:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-11 8:03 [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() Roland Stigge
2012-06-11 8:03 ` [PATCH 2/3] net: lpc_eth: Increase number of TX descriptors Roland Stigge
2012-06-11 8:11 ` David Miller
2012-06-11 8:21 ` Eric Dumazet
2012-06-11 8:03 ` [PATCH 3/3] net: lpc_eth: Driver cleanup Roland Stigge
2012-06-11 8:10 ` [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() David Miller
2012-06-11 8:25 ` Eric Dumazet
2012-06-11 8:36 ` Roland Stigge
2012-06-11 8:53 ` Eric Dumazet
2012-06-11 17:21 ` Eric Dumazet [this message]
2012-06-11 18:58 ` [PATCH] net: lpc_eth: fix tx completion Roland Stigge
2012-06-11 20:13 ` David Miller
2012-06-11 9:03 ` [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() David Miller
2012-06-11 9:26 ` Roland Stigge
2012-06-11 19:18 ` Eric Dumazet
2012-06-13 6:16 ` Eric Dumazet
2012-06-13 9:28 ` Roland Stigge
2012-06-13 9:58 ` [PATCH net-next] net: lpc_eth: free skbs in start_xmit Eric Dumazet
2012-06-17 23:28 ` David Miller
2012-06-11 8:39 ` [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339435296.6001.2484.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=aletes.xgr@gmail.com \
--cc=davem@davemloft.net \
--cc=kevin.wells@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=srinivas.bakki@nxp.com \
--cc=stigge@antcom.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox