Commit 16d083e2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: switch to netif_napi_add_tx() 



Switch net callers to the new API not requiring
the NAPI_POLL_WEIGHT argument.

Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Acked-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Acked-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Link: https://lore.kernel.org/r/20220504163725.550782-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fd49f8e6

drivers/net/ethernet/broadcom/bcm4908_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev) 
	netdev->min_mtu = ETH_ZLEN;

	netdev->mtu = ETH_DATA_LEN;

	netdev->max_mtu = ENET_MTU_MAX;

	netif_tx_napi_add(netdev, &enet->tx_ring.napi, bcm4908_enet_poll_tx, NAPI_POLL_WEIGHT);

	netif_napi_add_tx(netdev, &enet->tx_ring.napi, bcm4908_enet_poll_tx);

	netif_napi_add(netdev, &enet->rx_ring.napi, bcm4908_enet_poll_rx, NAPI_POLL_WEIGHT);



	err = register_netdev(netdev);

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv, 
	/* Initialize SW view of the ring */

	spin_lock_init(&ring->lock);

	ring->priv = priv;

	netif_tx_napi_add(priv->netdev, &ring->napi, bcm_sysport_tx_poll, 64);

	netif_napi_add_tx(priv->netdev, &ring->napi, bcm_sysport_tx_poll);

	ring->index = index;

	ring->size = size;

	ring->clean_index = 0;

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −2
Original line number Diff line number Diff line
@@ -2671,8 +2671,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, 
				  DMA_END_ADDR);



	/* Initialize Tx NAPI */

	netif_tx_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll,

			  NAPI_POLL_WEIGHT);

	netif_napi_add_tx(priv->dev, &ring->napi, bcmgenet_tx_poll);

}



/* Initialize a RDMA ring */

drivers/net/ethernet/fungible/funeth/funeth_main.c

+1 −2
Original line number Diff line number Diff line
@@ -330,8 +330,7 @@ static int fun_alloc_queue_irqs(struct net_device *dev, unsigned int ntx, 
			return PTR_ERR(irq);



		fp->num_tx_irqs++;

		netif_tx_napi_add(dev, &irq->napi, fun_txq_napi_poll,

				  NAPI_POLL_WEIGHT);

		netif_napi_add_tx(dev, &irq->napi, fun_txq_napi_poll);

	}



	for (i = fp->num_rx_irqs; i < nrx; i++) {

drivers/net/ethernet/lantiq_xrx200.c

+2 −2
Original line number Diff line number Diff line
@@ -615,8 +615,8 @@ static int xrx200_probe(struct platform_device *pdev) 
	/* setup NAPI */

	netif_napi_add(net_dev, &priv->chan_rx.napi, xrx200_poll_rx,

		       NAPI_POLL_WEIGHT);

	netif_tx_napi_add(net_dev, &priv->chan_tx.napi, xrx200_tx_housekeeping,

			  NAPI_POLL_WEIGHT);

	netif_napi_add_tx(net_dev, &priv->chan_tx.napi,

			  xrx200_tx_housekeeping);



	platform_set_drvdata(pdev, priv);