net: switch to netif_napi_add_tx()

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

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Acked-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Acked-by: Alexandra Winter <wintera@linux.ibm.com>
Link: https://lore.kernel.org/r/20220504163725.550782-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index 4a2622b05ee12adbbb5c1f04c97e3e96bf2c4b40..c131d81184893f75c8a8c2540de645cbcbc09a1e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -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);

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 60dde29974bfea53f8092fda078f348d36c6a6ef..a4ce96bb39039a20e00ec80eacd5291939a71494 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -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;

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index bf1ec8fdc2adc0a62e06393c41bca7e1afa70c54..65606351634e8154b7fc3832d956f9995a91e20f 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -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 */

diff --git a/drivers/net/ethernet/fungible/funeth/funeth_main.c b/drivers/net/ethernet/fungible/funeth/funeth_main.c
index 67dd02ed1fa3dbb5392e048f450f386498c33e16..9485cf699c5d647793c76b146be74e4574720397 100644 (file)
--- a/drivers/net/ethernet/fungible/funeth/funeth_main.c
+++ b/drivers/net/ethernet/fungible/funeth/funeth_main.c
@@ -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++) {

diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c
index 5712c3e94be813eecb668d97be06385983e78a72..5edb68a8aab1ececb61a652ca6163a4302beabd7 100644 (file)
--- a/drivers/net/ethernet/lantiq_xrx200.c
+++ b/drivers/net/ethernet/lantiq_xrx200.c
@@ -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);
 

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
index d5fc72b1a36fbc29864be1b7442c39c0030c199f..6affbd241264a1493e04d93f01f1ec0e78756170 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
@@ -147,8 +147,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
        switch (cq->type) {
        case TX:
                cq->mcq.comp = mlx4_en_tx_irq;
-               netif_tx_napi_add(cq->dev, &cq->napi, mlx4_en_poll_tx_cq,
-                                 NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(cq->dev, &cq->napi, mlx4_en_poll_tx_cq);
                napi_enable(&cq->napi);
                break;
        case RX:

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index b7d3ba1b4d17e59ab18b48878e9664a2db46330e..06f853c5c14119771e4547050987f8b0cac2c98d 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1371,7 +1371,7 @@ static int mana_create_txq(struct mana_port_context *apc,
 
                gc->cq_table[cq->gdma_id] = cq->gdma_cq;
 
-               netif_tx_napi_add(net, &cq->napi, mana_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(net, &cq->napi, mana_poll);
                napi_enable(&cq->napi);
 
                mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT);

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index bcf3746220dff0b999e134b24c4841d67a5a29e5..8d43ca282956d10adc9f0576e36aac2a7900ff20 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -1608,8 +1608,8 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
        if (qlcnic_check_multi_tx(adapter) && !adapter->ahw->diag_test) {
                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                        tx_ring = &adapter->tx_ring[ring];
-                       netif_tx_napi_add(netdev, &tx_ring->napi, qlcnic_tx_poll,
-                                      NAPI_POLL_WEIGHT);
+                       netif_napi_add_tx(netdev, &tx_ring->napi,
+                                         qlcnic_tx_poll);
                }
        }
 
@@ -2138,9 +2138,8 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
            !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                        tx_ring = &adapter->tx_ring[ring];
-                       netif_tx_napi_add(netdev, &tx_ring->napi,
-                                      qlcnic_83xx_msix_tx_poll,
-                                      NAPI_POLL_WEIGHT);
+                       netif_napi_add_tx(netdev, &tx_ring->napi,
+                                         qlcnic_83xx_msix_tx_poll);
                }
        }
 

diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index 3fcea211716c84cdbe16db0983f565e1460e4f46..fc83ec23bd1d8b3a85c0e6f9166aa771b7e47de7 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -2573,8 +2573,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
        rocker_port_dev_addr_init(rocker_port);
        dev->netdev_ops = &rocker_port_netdev_ops;
        dev->ethtool_ops = &rocker_port_ethtool_ops;
-       netif_tx_napi_add(dev, &rocker_port->napi_tx, rocker_port_poll_tx,
-                         NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(dev, &rocker_port->napi_tx, rocker_port_poll_tx);
        netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx,
                       NAPI_POLL_WEIGHT);
        rocker_carrier_init(rocker_port);

diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c
index 2c48f8b8ab714e7982c282ae4e56be8ed8d557d3..f0c8de2c607550f6f4818cb0e7e6746291790f3f 100644 (file)
--- a/drivers/net/ethernet/socionext/sni_ave.c
+++ b/drivers/net/ethernet/socionext/sni_ave.c
@@ -1689,8 +1689,7 @@ static int ave_probe(struct platform_device *pdev)
        /* Register as a NAPI supported driver */
        netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx,
                       NAPI_POLL_WEIGHT);
-       netif_tx_napi_add(ndev, &priv->napi_tx, ave_napi_poll_tx,
-                         NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(ndev, &priv->napi_tx, ave_napi_poll_tx);
 
        platform_set_drvdata(pdev, ndev);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 65ae3ae9582f4fde966c8a22796d256e392d1b43..3b81d4e9dc8366cf02cb56634c264095d4a5bee8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6759,9 +6759,8 @@ static void stmmac_napi_add(struct net_device *dev)
                                       NAPI_POLL_WEIGHT);
                }
                if (queue < priv->plat->tx_queues_to_use) {
-                       netif_tx_napi_add(dev, &ch->tx_napi,
-                                         stmmac_napi_poll_tx,
-                                         NAPI_POLL_WEIGHT);
+                       netif_napi_add_tx(dev, &ch->tx_napi,
+                                         stmmac_napi_poll_tx);
                }
                if (queue < priv->plat->rx_queues_to_use &&
                    queue < priv->plat->tx_queues_to_use) {

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index b7ebd741f28479b4d7c7ca0b4b692253c330e991..34197c67f8d9b4d8634ba4049504e119d9116978 100644 (file)
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2032,8 +2032,8 @@ static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common)
        for (i = 0; i < common->tx_ch_num; i++) {
                struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i];
 
-               netif_tx_napi_add(common->dma_ndev, &tx_chn->napi_tx,
-                                 am65_cpsw_nuss_tx_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(common->dma_ndev, &tx_chn->napi_tx,
+                                 am65_cpsw_nuss_tx_poll);
 
                ret = devm_request_irq(dev, tx_chn->irq,
                                       am65_cpsw_nuss_tx_irq,

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 662435e36805a87061242ddbdbc2069b29ae5e6c..ed66c4d4d830126e38a38b6ed2c874247b7f7c64 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1640,9 +1640,8 @@ static int cpsw_probe(struct platform_device *pdev)
        netif_napi_add(ndev, &cpsw->napi_rx,
                       cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll,
                       NAPI_POLL_WEIGHT);
-       netif_tx_napi_add(ndev, &cpsw->napi_tx,
-                         cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll,
-                         NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(ndev, &cpsw->napi_tx,
+                         cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll);
 
        /* register the network device */
        SET_NETDEV_DEV(ndev, dev);

diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
index 2993193208301b1bc0a2ba30d16fee37c854746d..353e58b22c512354157c51f2a484c66399f0a2b8 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1420,10 +1420,9 @@ static int cpsw_create_ports(struct cpsw_common *cpsw)
                                       cpsw->quirk_irq ?
                                       cpsw_rx_poll : cpsw_rx_mq_poll,
                                       NAPI_POLL_WEIGHT);
-                       netif_tx_napi_add(ndev, &cpsw->napi_tx,
+                       netif_napi_add_tx(ndev, &cpsw->napi_tx,
                                          cpsw->quirk_irq ?
-                                         cpsw_tx_poll : cpsw_tx_mq_poll,
-                                         NAPI_POLL_WEIGHT);
+                                         cpsw_tx_poll : cpsw_tx_mq_poll);
                }
 
                napi_ndev = ndev;

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 21b0e961eab5adeaa2e5d35897a6d932ba036577..b15d44261e766a5be5e6cf65ca9d026586747f6a 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -2096,7 +2096,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
 
        /* NAPI register */
        netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NAPI_POLL_WEIGHT);
-       netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add_tx(ndev, &netcp->tx_napi, netcp_tx_poll);
 
        /* Register the network device */
        ndev->dev_id            = 0;

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index bc981043cc808287608b271f7b0cf8a421ed3966..db4cb2de218c0ddfb8fbaae2860e74969b786761 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1614,8 +1614,8 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id)
        gsi_channel_program(channel, true);
 
        if (channel->toward_ipa)
-               netif_tx_napi_add(&gsi->dummy_dev, &channel->napi,
-                                 gsi_channel_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(&gsi->dummy_dev, &channel->napi,
+                                 gsi_channel_poll);
        else
                netif_napi_add(&gsi->dummy_dev, &channel->napi,
                               gsi_channel_poll, NAPI_POLL_WEIGHT);

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index dbe4c0a4be2cd626824604e75848b4f9f2859a49..87a635aac0084a1008276a0bab2f5f794fc04c52 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -268,8 +268,7 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile,
        tfile->napi_enabled = napi_en;
        tfile->napi_frags_enabled = napi_en && napi_frags;
        if (napi_en) {
-               netif_tx_napi_add(tun->dev, &tfile->napi, tun_napi_poll,
-                                 NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(tun->dev, &tfile->napi, tun_napi_poll);
                napi_enable(&tfile->napi);
        }
 }

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index ae85179ca49a1ed174ff2926f5d23ffad28be935..9e54fe76a9b2e8077f9147cc6db301a4de186e05 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -7099,8 +7099,7 @@ int qeth_open(struct net_device *dev)
 
        local_bh_disable();
        qeth_for_each_output_queue(card, queue, i) {
-               netif_tx_napi_add(dev, &queue->napi, qeth_tx_poll,
-                                 NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(dev, &queue->napi, qeth_tx_poll);
                napi_enable(&queue->napi);
                napi_schedule(&queue->napi);
        }

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 52ed2c0ac90126499a13fdc8fd40acb3a5bc40c6..7a9e2545884f4b623846351c7993a07009cd74e4 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3786,8 +3786,8 @@ void __init mptcp_proto_init(void)
        for_each_possible_cpu(cpu) {
                delegated = per_cpu_ptr(&mptcp_delegated_actions, cpu);
                INIT_LIST_HEAD(&delegated->head);
-               netif_tx_napi_add(&mptcp_napi_dev, &delegated->napi, mptcp_napi_poll,
-                                 NAPI_POLL_WEIGHT);
+               netif_napi_add_tx(&mptcp_napi_dev, &delegated->napi,
+                                 mptcp_napi_poll);
                napi_enable(&delegated->napi);
        }