Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2018-07-24 19:21:58 -07:00
parent aea5f654e6 9981b4fb86
commit 19725496da
124 changed files with 1267 additions and 700 deletions
--- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c
@@ -229,6 +229,7 @@ netdev_tx_t hinic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 		txq->txq_stats.tx_busy++;
 		u64_stats_update_end(&txq->txq_stats.syncp);
 		err = NETDEV_TX_BUSY;
+		wqe_size = 0;
 		goto flush_skbs;
 	}