tree 21714b958e1c9786895f5dc70821c45997efb467
parent 5b0bce247cc2423defedf289f8b84e22385426ee
parent 96a50c0d907ac8f5c3d6b051031a19eb8a2b53e3
author David S. Miller <davem@davemloft.net> 1565126041 -0700
committer David S. Miller <davem@davemloft.net> 1565126041 -0700

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>