From e34a5c99794786cc5b83dec8d208c538a3e0a604 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 11 Jun 2012 07:21:36 +0000 Subject: [PATCH] --- yaml --- r: 310773 b: refs/heads/master c: 3f16da51b0e533871d22a29682f3c3969d4f7e22 h: refs/heads/master i: 310771: 3fa3245539d1bd37eb94d7359315a6c91bbb9b70 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/nxp/lpc_eth.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f16e3c79addb..8aa058c3420f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e30478598a8476d02e3b00caa89ce1a3b1dad54b +refs/heads/master: 3f16da51b0e533871d22a29682f3c3969d4f7e22 diff --git a/trunk/drivers/net/ethernet/nxp/lpc_eth.c b/trunk/drivers/net/ethernet/nxp/lpc_eth.c index 10febdc2bd1a..083d6715335c 100644 --- a/trunk/drivers/net/ethernet/nxp/lpc_eth.c +++ b/trunk/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)