diff options
| author | Zhao Chen <zhaochen6@huawei.com> | 2018-07-18 00:33:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-28 07:57:13 +0200 |
| commit | 8b0fe96d33d480a4461bbdc7339c4ea4385a177e (patch) | |
| tree | 452161ba50a07ce5f9a581a37076a5398aea0d41 | |
| parent | 254b7df2a24ada8e5c79cd0f2270d151de7af3ca (diff) | |
| download | linux-stable-8b0fe96d33d480a4461bbdc7339c4ea4385a177e.tar.gz linux-stable-8b0fe96d33d480a4461bbdc7339c4ea4385a177e.tar.bz2 linux-stable-8b0fe96d33d480a4461bbdc7339c4ea4385a177e.zip | |
net-next/hinic: fix a problem in hinic_xmit_frame()
[ Upstream commit f7482683f1f4925c60941dbbd0813ceaa069d106 ]
The calculation of "wqe_size" is not correct when the tx queue is busy in
hinic_xmit_frame().
When there are no free WQEs, the tx flow will unmap the skb buffer, then
ring the doobell for the pending packets. But the "wqe_size" which used
to calculate the doorbell address is not correct. The wqe size should be
cleared to 0, otherwise, it will cause a doorbell error.
This patch fixes the problem.
Reported-by: Zhou Wang <wangzhou1@hisilicon.com>
Signed-off-by: Zhao Chen <zhaochen6@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/huawei/hinic/hinic_tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c index 9128858479c4..2353ec829c04 100644 --- 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; } |