On 09/10/2023 16:37, Christian Marangi wrote:
Now that napi_schedule return a bool, we can drop napi_reschedule that
does the same exact function. The function comes from a very old commit
bfe13f54f502 ("ibm_emac: Convert to use napi_struct independent of struct
net_device") and the purpose is actually deprecated in favour of
different logic.

Convert every user of napi_reschedule to napi_schedule.

Signed-off-by: Christian Marangi <ansuels...@gmail.com>
Acked-by: Jeff Johnson <quic_jjohn...@quicinc.com> # ath10k
Acked-by: Nick Child <nnac...@linux.ibm.com> # ibm
Acked-by: Marc Kleine-Budde <m...@pengutronix.de> # for can/dev/rx-offload.c
Reviewed-by: Eric Dumazet <eduma...@google.com>
---
Changes v3:
- Add Reviewed-by tag
Changes v2:
- Add ack tag
---
  drivers/infiniband/ulp/ipoib/ipoib_ib.c                |  4 ++--
  drivers/net/can/dev/rx-offload.c                       |  2 +-
  drivers/net/ethernet/chelsio/cxgb4/sge.c               |  2 +-
  drivers/net/ethernet/chelsio/cxgb4vf/sge.c             |  2 +-
  drivers/net/ethernet/ezchip/nps_enet.c                 |  2 +-
  drivers/net/ethernet/google/gve/gve_main.c             |  2 +-
  drivers/net/ethernet/ibm/ehea/ehea_main.c              |  2 +-
  drivers/net/ethernet/ibm/emac/mal.c                    |  2 +-
  drivers/net/ethernet/ibm/ibmveth.c                     |  2 +-
  drivers/net/ethernet/ibm/ibmvnic.c                     |  2 +-
  drivers/net/ethernet/mellanox/mlx4/en_rx.c             |  2 +-
  drivers/net/ethernet/ni/nixge.c                        |  2 +-
  drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c |  2 +-
  drivers/net/ethernet/xscale/ixp4xx_eth.c               |  4 ++--
  drivers/net/fjes/fjes_main.c                           |  2 +-
  drivers/net/wan/ixp4xx_hss.c                           |  4 ++--
  drivers/net/wireless/ath/ath10k/pci.c                  |  2 +-
  drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c             |  2 +-
  include/linux/netdevice.h                              | 10 ----------
  19 files changed, 21 insertions(+), 31 deletions(-)


...

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c 
b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 332472fe4990..a09b6e05337d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -400,7 +400,7 @@ void mlx4_en_recover_from_oom(struct mlx4_en_priv *priv)
        for (ring = 0; ring < priv->rx_ring_num; ring++) {
                if (mlx4_en_is_ring_empty(priv->rx_ring[ring])) {
                        local_bh_disable();
-                       napi_reschedule(&priv->rx_cq[ring]->napi);
+                       napi_schedule(&priv->rx_cq[ring]->napi);
                        local_bh_enable();
                }
        }

For mlx4 part:
Acked-by: Tariq Toukan <tar...@nvidia.com>

Reply via email to