projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sunvnet: failed trigger should not cause BUG_ON()
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
sun
/
sunvnet.c
diff --git
a/drivers/net/ethernet/sun/sunvnet.c
b/drivers/net/ethernet/sun/sunvnet.c
index 22e0cad1b4b5a21e0edc9215781c1052a9c6ef84..401abf7254d33bfb0e81e12dc1eeaf4abbf32b51 100644
(file)
--- a/
drivers/net/ethernet/sun/sunvnet.c
+++ b/
drivers/net/ethernet/sun/sunvnet.c
@@
-1411,6
+1411,8
@@
static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(err < 0)) {
netdev_info(dev, "TX trigger error %d\n", err);
d->hdr.state = VIO_DESC_FREE;
+ skb = port->tx_bufs[txi].skb;
+ port->tx_bufs[txi].skb = NULL;
dev->stats.tx_carrier_errors++;
goto out_dropped;
}