lkml.org 
[lkml]   [2015]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 033/130] niu: don't count tx error twice in case of headroom realloc fails
    Date
    3.16.7-ckt17 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Jiri Pirko <jiri@resnulli.us>

    commit 42288830494cd51873ca745a7a229023df061226 upstream.

    Fixes: a3138df9 ("[NIU]: Add Sun Neptune ethernet driver.")
    Signed-off-by: Jiri Pirko <jiri@resnulli.us>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/ethernet/sun/niu.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
    index 79606f47a08e..59624eb70308 100644
    --- a/drivers/net/ethernet/sun/niu.c
    +++ b/drivers/net/ethernet/sun/niu.c
    @@ -6665,10 +6665,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb,
    struct sk_buff *skb_new;

    skb_new = skb_realloc_headroom(skb, len);
    - if (!skb_new) {
    - rp->tx_errors++;
    + if (!skb_new)
    goto out_drop;
    - }
    kfree_skb(skb);
    skb = skb_new;
    } else

    \
     
     \ /
      Last update: 2015-09-04 16:21    [W:2.416 / U:1.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site