|
|
@@ -668,15 +668,15 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
|
|
|
--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
|
|
|
+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
|
|
|
-@@ -555,7 +555,7 @@ refill:
|
|
|
+@@ -559,7 +559,7 @@ refill:
|
|
|
priv->reg_inten |= RCV_INT;
|
|
|
writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN);
|
|
|
}
|
|
|
- napi_complete(napi);
|
|
|
+ napi_complete_done(napi, rx);
|
|
|
done:
|
|
|
- /* clean up tx descriptors and start a new timer if necessary */
|
|
|
- tx_remaining = hip04_tx_reclaim(ndev, false);
|
|
|
+ /* start a new timer if necessary */
|
|
|
+ if (rx < budget && tx_remaining)
|
|
|
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
|
|
|
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
|
|
|
@@ -330,7 +330,7 @@ static int hisi_femac_poll(struct napi_s
|