projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
ibm
/
ibmvnic.c
diff --git
a/drivers/net/ethernet/ibm/ibmvnic.c
b/drivers/net/ethernet/ibm/ibmvnic.c
index
ed77191
..
a775c69
100644
(file)
--- a/
drivers/net/ethernet/ibm/ibmvnic.c
+++ b/
drivers/net/ethernet/ibm/ibmvnic.c
@@
-1731,7
+1731,6
@@
static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
tx_send_failed++;
tx_dropped++;
ret = NETDEV_TX_OK;
- ibmvnic_tx_scrq_flush(adapter, tx_scrq);
goto out;
}
@@
-1753,6
+1752,7
@@
static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
dev_kfree_skb_any(skb);
tx_send_failed++;
tx_dropped++;
+ ibmvnic_tx_scrq_flush(adapter, tx_scrq);
ret = NETDEV_TX_OK;
goto out;
}