lkml.org 
[lkml]   [2015]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 01/95] [3.13-stable only] Revert "gianfar: Carefully free skbs in functions called by netpoll."
    Date
    3.13.11-ckt21 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Kamal Mostafa <kamal@canonical.com>

    This reverts commit 06b1d865b5dab1c9183318ddbe4075dc50131e82.

    This commit is not suitable for 3.13-stable; dev_consume_skb_any() does
    not exist.

    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/ethernet/freescale/gianfar.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
    index fd66535..b14d790 100644
    --- a/drivers/net/ethernet/freescale/gianfar.c
    +++ b/drivers/net/ethernet/freescale/gianfar.c
    @@ -2139,13 +2139,13 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
    skb_new = skb_realloc_headroom(skb, fcb_len);
    if (!skb_new) {
    dev->stats.tx_errors++;
    - dev_kfree_skb_any(skb);
    + kfree_skb(skb);
    return NETDEV_TX_OK;
    }

    if (skb->sk)
    skb_set_owner_w(skb_new, skb->sk);
    - dev_consume_skb_any(skb);
    + consume_skb(skb);
    skb = skb_new;
    }

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-05-27 21:41    [W:3.604 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site