OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
64b892a
)
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
David S. Miller
<davem@davemloft.net>
Mon, 27 Jul 2015 04:17:54 +0000
(21:17 -0700)
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>
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
0c5842a
..
ab6051a
100644
(file)
--- a/
drivers/net/ethernet/sun/niu.c
+++ b/
drivers/net/ethernet/sun/niu.c
@@
-6658,10
+6658,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