From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Aug 2019 21:14:01 +0000 (-0700)
Subject: Merge branch 'hisilicon-fixes'
X-Git-Tag: microblaze-v5.4-rc1~109^2~3
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2b0dfc1753332d81d8e6654d682d8740aed4dec9;p=linux-2.6-microblaze.git

Merge branch 'hisilicon-fixes'

Jiangfeng Xiao says:

====================
net: hisilicon: Fix a few problems with hip04_eth

During the use of the hip04_eth driver,
several problems were found,
which solved the hip04_tx_reclaim reentry problem,
fixed the problem that hip04_mac_start_xmit never
returns NETDEV_TX_BUSY
and the dma_map_single failed on the arm64 platform.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

2b0dfc1753332d81d8e6654d682d8740aed4dec9