lkml.org 
[lkml]   [2012]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 027/187] lpc_eth: fix tx completion
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

    ------------------


    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 3f16da51b0e533871d22a29682f3c3969d4f7e22 ]

    __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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/nxp/lpc_eth.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/net/ethernet/nxp/lpc_eth.c
    +++ b/drivers/net/ethernet/nxp/lpc_eth.c
    @@ -936,16 +936,16 @@ static void __lpc_handle_xmit(struct net
    /* 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)



    \
     
     \ /
      Last update: 2012-07-13 02:41    [W:4.348 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site