git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba2bab3
)
niu: don't count tx error twice in case of headroom realloc fails
author
Jiri Pirko
<jiri@resnulli.us>
Thu, 23 Jul 2015 10:20:37 +0000
(12:20 +0200)
committer
Ben Hutchings
<ben@decadent.org.uk>
Wed, 12 Aug 2015 14:33:23 +0000
(16:33 +0200)
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: Ben Hutchings <ben@decadent.org.uk>
drivers/net/ethernet/sun/niu.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/sun/niu.c
b/drivers/net/ethernet/sun/niu.c
index
73c7081
..
c646a49
100644
(file)
--- a/
drivers/net/ethernet/sun/niu.c
+++ b/
drivers/net/ethernet/sun/niu.c
@@
-6670,10
+6670,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