]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
niu: don't count tx error twice in case of headroom realloc fails
authorJiri Pirko <jiri@resnulli.us>
Thu, 23 Jul 2015 10:20:37 +0000 (12:20 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 25 Aug 2015 09:13:51 +0000 (10:13 +0100)
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

index 79606f47a08e0989396203e5ba54485dba33a04f..59624eb70308b96a034d0662fea2336d50f3389d 100644 (file)
@@ -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