lkml.org 
[lkml]   [2017]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.12 12/52] net: bcmgenet: Be drop monitor friendly
    Date
    4.12-stable review patch.  If anyone has any objections, please let me know.

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

    From: Florian Fainelli <f.fainelli@gmail.com>


    [ Upstream commit d4fec855905fa8bd5fb1c59f73ad2d74a944876a ]

    There are 3 spots where we call dev_kfree_skb() but we are actually
    just doing a normal SKB consumption: __bcmgenet_tx_reclaim() for normal
    TX reclamation, bcmgenet_alloc_rx_buffers() during the initial RX ring
    setup and bcmgenet_free_rx_buffers() during RX ring cleanup.

    Fixes: d6707bec5986 ("net: bcmgenet: rewrite bcmgenet_rx_refill()")
    Fixes: f48bed16a756 ("net: bcmgenet: Free skb after last Tx frag")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    @@ -1203,7 +1203,7 @@ static struct enet_cb *bcmgenet_get_txcb
    /* Simple helper to free a control block's resources */
    static void bcmgenet_free_cb(struct enet_cb *cb)
    {
    - dev_kfree_skb_any(cb->skb);
    + dev_consume_skb_any(cb->skb);
    cb->skb = NULL;
    dma_unmap_addr_set(cb, dma_addr, 0);
    }
    @@ -1868,7 +1868,7 @@ static int bcmgenet_alloc_rx_buffers(str
    cb = ring->cbs + i;
    skb = bcmgenet_rx_refill(priv, cb);
    if (skb)
    - dev_kfree_skb_any(skb);
    + dev_consume_skb_any(skb);
    if (!cb->skb)
    return -ENOMEM;
    }

    \
     
     \ /
      Last update: 2017-09-18 11:49    [W:2.866 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site