net: drop the weight argument from netif_napi_add
authorJakub Kicinski <kuba@kernel.org>
Tue, 27 Sep 2022 13:27:53 +0000 (06:27 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 29 Sep 2022 01:57:14 +0000 (18:57 -0700)
We tell driver developers to always pass NAPI_POLL_WEIGHT
as the weight to netif_napi_add(). This may be confusing
to newcomers, drop the weight argument, those who really
need to tweak the weight can use netif_napi_add_weight().

Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for CAN
Link: https://lore.kernel.org/r/20220927132753.750069-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
170 files changed:
drivers/net/can/ctucanfd/ctucanfd_base.c
drivers/net/can/ifi_canfd/ifi_canfd.c
drivers/net/can/m_can/m_can.c
drivers/net/ethernet/actions/owl-emac.c
drivers/net/ethernet/aeroflex/greth.c
drivers/net/ethernet/agere/et131x.c
drivers/net/ethernet/alacritech/slicoss.c
drivers/net/ethernet/altera/altera_tse_main.c
drivers/net/ethernet/amazon/ena/ena_netdev.c
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
drivers/net/ethernet/apm/xgene-v2/main.c
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
drivers/net/ethernet/aquantia/atlantic/aq_vec.c
drivers/net/ethernet/atheros/alx/main.c
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/broadcom/b44.c
drivers/net/ethernet/broadcom/bcm4908_enet.c
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/broadcom/bgmac.c
drivers/net/ethernet/broadcom/bnx2.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/brocade/bna/bnad.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/calxeda/xgmac.c
drivers/net/ethernet/cavium/liquidio/lio_core.c
drivers/net/ethernet/cavium/thunder/nicvf_main.c
drivers/net/ethernet/chelsio/cxgb/cxgb2.c
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
drivers/net/ethernet/chelsio/cxgb4/sge.c
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/net/ethernet/cirrus/ep93xx_eth.c
drivers/net/ethernet/cisco/enic/enic_main.c
drivers/net/ethernet/cortina/gemini.c
drivers/net/ethernet/dnet.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/engleder/tsnep_main.c
drivers/net/ethernet/ethoc.c
drivers/net/ethernet/faraday/ftgmac100.c
drivers/net/ethernet/faraday/ftmac100.c
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
drivers/net/ethernet/freescale/enetc/enetc.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/freescale/ucc_geth.c
drivers/net/ethernet/fungible/funeth/funeth_main.c
drivers/net/ethernet/google/gve/gve_main.c
drivers/net/ethernet/hisilicon/hip04_eth.c
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
drivers/net/ethernet/hisilicon/hns/hns_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/ibm/ehea/ehea_main.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/fm10k/fm10k_main.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ice/ice_base.c
drivers/net/ethernet/intel/ice/ice_eswitch.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/igbvf/netdev.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/intel/ixgb/ixgb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/jme.c
drivers/net/ethernet/korina.c
drivers/net/ethernet/lantiq_xrx200.c
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/marvell/mvneta.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/marvell/octeon_ep/octep_main.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
drivers/net/ethernet/marvell/skge.c
drivers/net/ethernet/marvell/sky2.c
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/mediatek/mtk_star_emac.c
drivers/net/ethernet/mellanox/mlx4/en_cq.c
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
drivers/net/ethernet/microchip/lan743x_main.c
drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c
drivers/net/ethernet/natsemi/natsemi.c
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
drivers/net/ethernet/ni/nixge.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/pasemi/pasemi_mac.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
drivers/net/ethernet/qlogic/qede/qede_main.c
drivers/net/ethernet/qlogic/qla3xxx.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
drivers/net/ethernet/qualcomm/emac/emac.c
drivers/net/ethernet/rdc/r6040.c
drivers/net/ethernet/realtek/8139too.c
drivers/net/ethernet/realtek/r8169_main.c
drivers/net/ethernet/renesas/ravb_main.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/rocker/rocker_main.c
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
drivers/net/ethernet/sfc/ef100_rep.c
drivers/net/ethernet/sfc/efx_channels.c
drivers/net/ethernet/sfc/falcon/efx.c
drivers/net/ethernet/sfc/siena/efx_channels.c
drivers/net/ethernet/smsc/epic100.c
drivers/net/ethernet/smsc/smsc9420.c
drivers/net/ethernet/socionext/netsec.c
drivers/net/ethernet/socionext/sni_ave.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/sun/cassini.c
drivers/net/ethernet/sun/ldmvsw.c
drivers/net/ethernet/sun/niu.c
drivers/net/ethernet/sun/sungem.c
drivers/net/ethernet/sun/sunvnet.c
drivers/net/ethernet/sunplus/spl2sw_driver.c
drivers/net/ethernet/synopsys/dwc-xlgmac-net.c
drivers/net/ethernet/tehuti/tehuti.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/ethernet/ti/cpmac.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/cpsw_new.c
drivers/net/ethernet/ti/davinci_emac.c
drivers/net/ethernet/ti/netcp_core.c
drivers/net/ethernet/toshiba/ps3_gelic_net.c
drivers/net/ethernet/toshiba/spider_net.c
drivers/net/ethernet/tundra/tsi108_eth.c
drivers/net/ethernet/via/via-rhine.c
drivers/net/ethernet/via/via-velocity.c
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/fjes/fjes_main.c
drivers/net/hyperv/netvsc.c
drivers/net/hyperv/rndis_filter.c
drivers/net/ipa/gsi.c
drivers/net/thunderbolt.c
drivers/net/usb/lan78xx.c
drivers/net/veth.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wireguard/peer.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath10k/sdio.c
drivers/net/wireless/ath/ath10k/snoc.c
drivers/net/wireless/ath/ath10k/usb.c
drivers/net/wireless/ath/ath11k/ahb.c
drivers/net/wireless/ath/ath11k/pcic.c
drivers/net/wireless/ath/wil6210/netdev.c
drivers/net/wireless/intel/iwlwifi/pcie/rx.c
drivers/net/wireless/mediatek/mt76/dma.c
drivers/net/wireless/realtek/rtw88/pci.c
drivers/net/wireless/realtek/rtw89/core.c
drivers/net/xen-netback/interface.c
drivers/net/xen-netfront.c
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
drivers/staging/qlge/qlge_main.c
include/linux/netdevice.h
net/core/gro_cells.c

index c4026712ab7db4a3ffa6b61dc47d7bfa3ae55718..b8da15ea6ad9a1b050b71cb52ebfe00c2890fbd6 100644 (file)
@@ -1424,7 +1424,7 @@ int ctucan_probe_common(struct device *dev, void __iomem *addr, int irq, unsigne
 
        priv->can.clock.freq = can_clk_rate;
 
-       netif_napi_add(ndev, &priv->napi, ctucan_rx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, ctucan_rx_poll);
 
        ret = register_candev(ndev);
        if (ret) {
index ad7a89b95da7128ac563ae3154b652248e85ddb6..8d42b7e6661f2d37bd1f9414236bf4e0dc6d0ffa 100644 (file)
@@ -973,7 +973,7 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)
        priv->ndev = ndev;
        priv->base = addr;
 
-       netif_napi_add(ndev, &priv->napi, ifi_canfd_poll, 64);
+       netif_napi_add(ndev, &priv->napi, ifi_canfd_poll);
 
        priv->can.state = CAN_STATE_STOPPED;
 
index 4709c012b1dc90c2ccf58d0c3b3d826911b7deb4..dcb582563d5e43c82b8421bdae2f127159ab2576 100644 (file)
@@ -1467,8 +1467,7 @@ static int m_can_dev_setup(struct m_can_classdev *cdev)
        }
 
        if (!cdev->is_peripheral)
-               netif_napi_add(dev, &cdev->napi,
-                              m_can_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(dev, &cdev->napi, m_can_poll);
 
        /* Shared properties of all M_CAN versions */
        cdev->version = m_can_version;
index 1cfdd01b4c2e33877ee310af5daa13ce135684a9..cd4d71b83c334211a98aa3e142c48db452a5e125 100644 (file)
@@ -1576,7 +1576,7 @@ static int owl_emac_probe(struct platform_device *pdev)
        netdev->watchdog_timeo = OWL_EMAC_TX_TIMEOUT;
        netdev->netdev_ops = &owl_emac_netdev_ops;
        netdev->ethtool_ops = &owl_emac_ethtool_ops;
-       netif_napi_add(netdev, &priv->napi, owl_emac_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &priv->napi, owl_emac_poll);
 
        ret = devm_register_netdev(dev, netdev);
        if (ret) {
index 9c4fe25aca6c491689d71abd1afa4e274cad6e0c..e104fb02817d1d3ba62e38a7364eff15f7fc90d9 100644 (file)
@@ -1507,7 +1507,7 @@ static int greth_of_probe(struct platform_device *ofdev)
        }
 
        /* setup NAPI */
-       netif_napi_add(dev, &greth->napi, greth_poll, 64);
+       netif_napi_add(dev, &greth->napi, greth_poll);
 
        return 0;
 
index 28334b1e3d6b37510407a4bc0666d4b646515f0b..5fab589b3ddf6fe1909d0a200c4a4737a315d483 100644 (file)
@@ -3969,7 +3969,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,
 
        et131x_init_send(adapter);
 
-       netif_napi_add(netdev, &adapter->napi, et131x_poll, 64);
+       netif_napi_add(netdev, &adapter->napi, et131x_poll);
 
        eth_hw_addr_set(netdev, adapter->addr);
 
index 4cea61f16be3c8ebfa0c845f7f501f64b9cc9258..a30d0f172986b8187960465eade0d817bbca1d1b 100644 (file)
@@ -1803,7 +1803,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto unmap;
        }
 
-       netif_napi_add(dev, &sdev->napi, slic_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &sdev->napi, slic_poll);
        netif_carrier_off(dev);
 
        err = register_netdev(dev);
index 3cf409bdb28388122ed55f06af5d60e6c8dbe3ab..7633b227b2ca40ab17167c43ea205b2e11fbead2 100644 (file)
@@ -1365,7 +1365,7 @@ static int altera_tse_probe(struct platform_device *pdev)
        ndev->features |= NETIF_F_HW_VLAN_CTAG_RX;
 
        /* setup NAPI interface */
-       netif_napi_add(ndev, &priv->napi, tse_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, tse_poll);
 
        spin_lock_init(&priv->mac_cfg_lock);
        spin_lock_init(&priv->tx_lock);
index 371269e0b2b9d041dcace70906fd27c66772deb9..d350eeec8bad4c23cc6c2ec482bd0dd11677e292 100644 (file)
@@ -2265,10 +2265,8 @@ static void ena_init_napi_in_range(struct ena_adapter *adapter,
        for (i = first_index; i < first_index + count; i++) {
                struct ena_napi *napi = &adapter->ena_napi[i];
 
-               netif_napi_add(adapter->netdev,
-                              &napi->napi,
-                              ENA_IS_XDP_INDEX(adapter, i) ? ena_xdp_io_poll : ena_io_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(adapter->netdev, &napi->napi,
+                              ENA_IS_XDP_INDEX(adapter, i) ? ena_xdp_io_poll : ena_io_poll);
 
                if (!ENA_IS_XDP_INDEX(adapter, i)) {
                        napi->rx_ring = &adapter->rx_ring[i];
index f342bb85318917689d3c1909cdeaf8486602a0fe..7b666106feee935771b9e351f3b70b9d5d8d5cd3 100644 (file)
@@ -952,14 +952,14 @@ static void xgbe_napi_enable(struct xgbe_prv_data *pdata, unsigned int add)
                        channel = pdata->channel[i];
                        if (add)
                                netif_napi_add(pdata->netdev, &channel->napi,
-                                              xgbe_one_poll, NAPI_POLL_WEIGHT);
+                                              xgbe_one_poll);
 
                        napi_enable(&channel->napi);
                }
        } else {
                if (add)
                        netif_napi_add(pdata->netdev, &pdata->napi,
-                                      xgbe_all_poll, NAPI_POLL_WEIGHT);
+                                      xgbe_all_poll);
 
                napi_enable(&pdata->napi);
        }
index d022b6db9e06617fd556b00830596546a4fd5a32..379d19d18dbed0244d8b45ae08c515fe3c546c09 100644 (file)
@@ -672,7 +672,7 @@ static int xge_probe(struct platform_device *pdev)
        if (ret)
                goto err;
 
-       netif_napi_add(ndev, &pdata->napi, xge_napi, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &pdata->napi, xge_napi);
 
        ret = register_netdev(ndev);
        if (ret) {
index 53dc8d5fede86fff85f7bc09a78d0f87f4b17dba..d6cfea65a714030d3662915f9103c3ac36724b18 100644 (file)
@@ -1977,14 +1977,12 @@ static void xgene_enet_napi_add(struct xgene_enet_pdata *pdata)
 
        for (i = 0; i < pdata->rxq_cnt; i++) {
                napi = &pdata->rx_ring[i]->napi;
-               netif_napi_add(pdata->ndev, napi, xgene_enet_napi,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(pdata->ndev, napi, xgene_enet_napi);
        }
 
        for (i = 0; i < pdata->cq_cnt; i++) {
                napi = &pdata->tx_ring[i]->cp_ring->napi;
-               netif_napi_add(pdata->ndev, napi, xgene_enet_napi,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(pdata->ndev, napi, xgene_enet_napi);
        }
 }
 
index 275324c9e51ec227b98ab9a3bd2531c829a25d78..80b44043e6c53f07a1c54b5100f19f7d0d8bee08 100644 (file)
@@ -1217,8 +1217,7 @@ int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)
        atomic_set(&aq_ptp->offset_egress, 0);
        atomic_set(&aq_ptp->offset_ingress, 0);
 
-       netif_napi_add(aq_nic_get_ndev(aq_nic), &aq_ptp->napi,
-                      aq_ptp_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(aq_nic_get_ndev(aq_nic), &aq_ptp->napi, aq_ptp_poll);
 
        aq_ptp->idx_vector = idx_vec;
 
index f0fdf20f01c1601915eacadea46ac6fc0652f5ce..f5db1c44e9b9171f0ab53d10f99b482a47d2fb0e 100644 (file)
@@ -119,8 +119,7 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,
        self->tx_rings = 0;
        self->rx_rings = 0;
 
-       netif_napi_add(aq_nic_get_ndev(aq_nic), &self->napi,
-                      aq_vec_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(aq_nic_get_ndev(aq_nic), &self->napi, aq_vec_poll);
 
 err_exit:
        return self;
index a89b93cb4e26d91c8ab1be848b4a06696b30946b..80bb8424e9a4e4a6d0ee2c8c1912b5030ecfaafa 100644 (file)
@@ -752,7 +752,7 @@ static int alx_alloc_napis(struct alx_priv *alx)
                        goto err_out;
 
                np->alx = alx;
-               netif_napi_add(alx->dev, &np->napi, alx_poll, 64);
+               netif_napi_add(alx->dev, &np->napi, alx_poll);
                alx->qnapi[i] = np;
        }
 
index be4b1f8eef294f0b59f2afe47a8f54647fffbd18..40c781695d581d2270c19504c7687392ada00fc7 100644 (file)
@@ -2732,7 +2732,7 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev_set_threaded(netdev, true);
        for (i = 0; i < adapter->rx_queue_count; ++i)
                netif_napi_add(netdev, &adapter->rrd_ring[i].napi,
-                              atl1c_clean_rx, 64);
+                              atl1c_clean_rx);
        for (i = 0; i < adapter->tx_queue_count; ++i)
                netif_napi_add_tx(netdev, &adapter->tpd_ring[i].napi,
                                  atl1c_clean_tx);
index 57a51fb7746c8efe1277cf1db0e82419167f014c..5db0f3495a32e647988353de98348c4470d0fb66 100644 (file)
@@ -2354,7 +2354,7 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        adapter->mii.phy_id_mask = 0x1f;
        adapter->mii.reg_num_mask = MDIO_REG_ADDR_MASK;
 
-       netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64);
+       netif_napi_add(netdev, &adapter->napi, atl1e_clean);
 
        timer_setup(&adapter->phy_config_timer, atl1e_phy_config, 0);
 
index 7fcfba370fc36e80f68d5ad3a729feb93c8bab80..c8444bcdf52707a89bb72c09a3e88fcf08bd2ae7 100644 (file)
@@ -2977,7 +2977,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netdev->netdev_ops = &atl1_netdev_ops;
        netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, atl1_rings_clean, 64);
+       netif_napi_add(netdev, &adapter->napi, atl1_rings_clean);
 
        netdev->ethtool_ops = &atl1_ethtool_ops;
        adapter->bd_number = cards_found;
index 7821084c8fbe4044470e686e2afdd6b0f004dcaa..7f876721596c1a6067301a635ad08eb055b8a65d 100644 (file)
@@ -2375,7 +2375,7 @@ static int b44_init_one(struct ssb_device *sdev,
        bp->tx_pending = B44_DEF_TX_RING_PENDING;
 
        dev->netdev_ops = &b44_netdev_ops;
-       netif_napi_add(dev, &bp->napi, b44_poll, 64);
+       netif_napi_add(dev, &bp->napi, b44_poll);
        dev->watchdog_timeo = B44_TX_TIMEOUT;
        dev->min_mtu = B44_MIN_MTU;
        dev->max_mtu = B44_MAX_MTU;
index 489367fa5748dacb5b7ab1bc59646135275b2b7e..93ccf549e2ed34e05e88d7c6049089d97936b43d 100644 (file)
@@ -725,7 +725,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev)
        netdev->mtu = ETH_DATA_LEN;
        netdev->max_mtu = ENET_MTU_MAX;
        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);
+       netif_napi_add(netdev, &enet->rx_ring.napi, bcm4908_enet_poll_rx);
 
        err = register_netdev(netdev);
        if (err)
index 52144ea2bbf37cc4518e34de2947508d0bea46f7..867f14c30e09fbaf618586917948e6dc2ac9e755 100644 (file)
@@ -2564,7 +2564,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
        dev_set_drvdata(&pdev->dev, dev);
        dev->ethtool_ops = &bcm_sysport_ethtool_ops;
        dev->netdev_ops = &bcm_sysport_netdev_ops;
-       netif_napi_add(dev, &priv->napi, bcm_sysport_poll, 64);
+       netif_napi_add(dev, &priv->napi, bcm_sysport_poll);
 
        dev->features |= NETIF_F_RXCSUM | NETIF_F_HIGHDMA |
                         NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
index 29a9ab20ff98cca1ba41cf4662965119e0710a56..5fb3af5670ecbbc80b5045866a70780e653ec7d4 100644 (file)
@@ -1527,7 +1527,7 @@ int bgmac_enet_probe(struct bgmac *bgmac)
        if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0)
                bgmac->int_mask &= ~BGMAC_IS_TX_MASK;
 
-       netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(net_dev, &bgmac->napi, bgmac_poll);
 
        err = bgmac_phy_connect(bgmac);
        if (err) {
index b612781be893b645084379fef81165bba9a1ccf5..9624c45026edc2b8a35e168a222005ff26562f8f 100644 (file)
@@ -8522,7 +8522,7 @@ bnx2_init_napi(struct bnx2 *bp)
                else
                        poll = bnx2_poll_msix;
 
-               netif_napi_add(bp->dev, &bp->bnx2_napi[i].napi, poll, 64);
+               netif_napi_add(bp->dev, &bp->bnx2_napi[i].napi, poll);
                bnapi->bp = bp;
        }
 }
index e704e42446aa82e77788d4b1daeecacbc5eb8f8e..b6eb3ce976f08862e23f2b5efd1ea776f4f050fb 100644 (file)
@@ -44,8 +44,7 @@ static void bnx2x_add_all_napi_cnic(struct bnx2x *bp)
 
        /* Add NAPI objects */
        for_each_rx_queue_cnic(bp, i) {
-               netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
-                              bnx2x_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi), bnx2x_poll);
        }
 }
 
@@ -55,8 +54,7 @@ static void bnx2x_add_all_napi(struct bnx2x *bp)
 
        /* Add NAPI objects */
        for_each_eth_queue(bp, i) {
-               netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
-                              bnx2x_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi), bnx2x_poll);
        }
 }
 
index 96da0ba3d507878de161687a852e7cec912a1616..eed98c10ca9d6e422c926e9e72cdf10fd312ea03 100644 (file)
@@ -9366,16 +9366,16 @@ static void bnxt_init_napi(struct bnxt *bp)
                        cp_nr_rings--;
                for (i = 0; i < cp_nr_rings; i++) {
                        bnapi = bp->bnapi[i];
-                       netif_napi_add(bp->dev, &bnapi->napi, poll_fn, 64);
+                       netif_napi_add(bp->dev, &bnapi->napi, poll_fn);
                }
                if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {
                        bnapi = bp->bnapi[cp_nr_rings];
                        netif_napi_add(bp->dev, &bnapi->napi,
-                                      bnxt_poll_nitroa0, 64);
+                                      bnxt_poll_nitroa0);
                }
        } else {
                bnapi = bp->bnapi[0];
-               netif_napi_add(bp->dev, &bnapi->napi, bnxt_poll, 64);
+               netif_napi_add(bp->dev, &bnapi->napi, bnxt_poll);
        }
 }
 
index 667e66079c7346c0f5aeb428ce182440722e67b6..25c4506069856bb2dbdcdc703b649f81b6a156f2 100644 (file)
@@ -2707,8 +2707,7 @@ static int bcmgenet_init_rx_ring(struct bcmgenet_priv *priv,
        bcmgenet_init_rx_coalesce(ring);
 
        /* Initialize Rx NAPI */
-       netif_napi_add(priv->dev, &ring->napi, bcmgenet_rx_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(priv->dev, &ring->napi, bcmgenet_rx_poll);
 
        bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_PROD_INDEX);
        bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_CONS_INDEX);
index 59d2d907e989d7690082695136e9bc5c5e47dab0..4179a12fc881950a04871faa592e55a98d275cf9 100644 (file)
@@ -7380,9 +7380,9 @@ static void tg3_napi_init(struct tg3 *tp)
 {
        int i;
 
-       netif_napi_add(tp->dev, &tp->napi[0].napi, tg3_poll, 64);
+       netif_napi_add(tp->dev, &tp->napi[0].napi, tg3_poll);
        for (i = 1; i < tp->irq_cnt; i++)
-               netif_napi_add(tp->dev, &tp->napi[i].napi, tg3_poll_msix, 64);
+               netif_napi_add(tp->dev, &tp->napi[i].napi, tg3_poll_msix);
 }
 
 static void tg3_napi_fini(struct tg3 *tp)
index 29dd0f93d6c03c5cf16331d35b594680fec56882..d6d90f9722a7e771f24e96ae015fc660cb794019 100644 (file)
@@ -1891,7 +1891,7 @@ bnad_napi_add(struct bnad *bnad, u32 rx_id)
        for (i = 0; i < bnad->num_rxp_per_rx; i++) {
                rx_ctrl = &bnad->rx_info[rx_id].rx_ctrl[i];
                netif_napi_add(bnad->netdev, &rx_ctrl->napi,
-                              bnad_napi_poll_rx, NAPI_POLL_WEIGHT);
+                              bnad_napi_poll_rx);
        }
 }
 
index 4769c8a0c73a6109ca412e781c018c9625186e4f..c39697bed2fa2bcfd370c83e925db5d79e055733 100644 (file)
@@ -3978,8 +3978,8 @@ static int macb_init(struct platform_device *pdev)
                queue = &bp->queues[q];
                queue->bp = bp;
                spin_lock_init(&queue->tx_ptr_lock);
-               netif_napi_add(dev, &queue->napi_rx, macb_rx_poll, NAPI_POLL_WEIGHT);
-               netif_napi_add(dev, &queue->napi_tx, macb_tx_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(dev, &queue->napi_rx, macb_rx_poll);
+               netif_napi_add(dev, &queue->napi_tx, macb_tx_poll);
                if (hw_q) {
                        queue->ISR  = GEM_ISR(hw_q - 1);
                        queue->IER  = GEM_IER(hw_q - 1);
index 1281d1565ef84e298fb8270143ba1c8de0ef6bc0..f4f87dfa96874a13a39995651e464bfbc035b7b9 100644 (file)
@@ -1792,7 +1792,7 @@ static int xgmac_probe(struct platform_device *pdev)
                netdev_warn(ndev, "MAC address %pM not valid",
                         ndev->dev_addr);
 
-       netif_napi_add(ndev, &priv->napi, xgmac_poll, 64);
+       netif_napi_add(ndev, &priv->napi, xgmac_poll);
        ret = register_netdev(ndev);
        if (ret)
                goto err_reg;
index 73cb03266549ca29c1e869fef1ff7c487e9b1c0a..882b2be06ea0e0ac7c9031f95e7757364e12e532 100644 (file)
@@ -851,7 +851,7 @@ int liquidio_setup_io_queues(struct octeon_device *octeon_dev, int ifidx,
                napi = &droq->napi;
                dev_dbg(&octeon_dev->pci_dev->dev, "netif_napi_add netdev:%llx oct:%llx\n",
                        (u64)netdev, (u64)octeon_dev);
-               netif_napi_add(netdev, napi, liquidio_napi_poll, 64);
+               netif_napi_add(netdev, napi, liquidio_napi_poll);
 
                /* designate a CPU for this droq */
                droq->cpu_id = cpu_id;
index 768ea426d49f413ad4c0df97414334f9b8a7a6ad..98f3dc460ca7ca1a1eb284996a40b5dcdac44a1f 100644 (file)
@@ -1472,8 +1472,7 @@ int nicvf_open(struct net_device *netdev)
                }
                cq_poll->cq_idx = qidx;
                cq_poll->nicvf = nic;
-               netif_napi_add(netdev, &cq_poll->napi, nicvf_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(netdev, &cq_poll->napi, nicvf_poll);
                napi_enable(&cq_poll->napi);
                nic->napi[qidx] = cq_poll;
        }
index 17043c4fce5233e54f350df3b8450a65a2dc19d8..d2286adf09fed53aea21534179a1f4cfce421a09 100644 (file)
@@ -1053,7 +1053,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                netdev->hard_header_len += (netdev->hw_features & NETIF_F_TSO) ?
                        sizeof(struct cpl_tx_pkt_lso) : sizeof(struct cpl_tx_pkt);
 
-               netif_napi_add(netdev, &adapter->napi, t1_poll, 64);
+               netif_napi_add(netdev, &adapter->napi, t1_poll);
 
                netdev->ethtool_ops = &t1_ethtool_ops;
 
index a46afc0bf5cc3254db158cabadbb653e637d03d2..a52e6b6e2876728431aa752dbe612e605bafcd96 100644 (file)
@@ -609,8 +609,7 @@ static void init_napi(struct adapter *adap)
                struct sge_qset *qs = &adap->sge.qs[i];
 
                if (qs->adap)
-                       netif_napi_add(qs->netdev, &qs->napi, qs->napi.poll,
-                                      64);
+                       netif_napi_add(qs->netdev, &qs->napi, qs->napi.poll);
        }
 
        /*
index ee52e3b1d74f73423274061c530b6ea79370d425..46809e2d94ee08bf619398791daf034beb4f8405 100644 (file)
@@ -4467,7 +4467,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
        if (ret)
                goto err;
 
-       netif_napi_add(dev, &iq->napi, napi_rx_handler, 64);
+       netif_napi_add(dev, &iq->napi, napi_rx_handler);
        iq->cur_desc = iq->desc;
        iq->cidx = 0;
        iq->gen = 1;
index 43b2ceb6aa3264a24a81210832cd5756c9457437..2d0cf76fb3c5a8cef6294de9053a467d5ecebeaa 100644 (file)
@@ -2336,7 +2336,7 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,
        if (ret)
                goto err;
 
-       netif_napi_add(dev, &rspq->napi, napi_rx_handler, 64);
+       netif_napi_add(dev, &rspq->napi, napi_rx_handler);
        rspq->cur_desc = rspq->desc;
        rspq->cidx = 0;
        rspq->gen = 1;
index 88850618532663546108bce9c0e80b43af3f7f10..8627ab19d47034c07a63649b17c0d148d961ff6e 100644 (file)
@@ -812,7 +812,7 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
        ep = netdev_priv(dev);
        ep->dev = dev;
        SET_NETDEV_DEV(dev, &pdev->dev);
-       netif_napi_add(dev, &ep->napi, ep93xx_poll, 64);
+       netif_napi_add(dev, &ep->napi, ep93xx_poll);
 
        platform_set_drvdata(pdev, dev);
 
index 372fb7b3a2825a50fe468e2699a0225e2945c773..29500d32e36265de97b704f8a6306dc14ede6e5d 100644 (file)
@@ -2633,16 +2633,17 @@ static int enic_dev_init(struct enic *enic)
 
        switch (vnic_dev_get_intr_mode(enic->vdev)) {
        default:
-               netif_napi_add(netdev, &enic->napi[0], enic_poll, 64);
+               netif_napi_add(netdev, &enic->napi[0], enic_poll);
                break;
        case VNIC_DEV_INTR_MODE_MSIX:
                for (i = 0; i < enic->rq_count; i++) {
                        netif_napi_add(netdev, &enic->napi[i],
-                               enic_poll_msix_rq, NAPI_POLL_WEIGHT);
+                                      enic_poll_msix_rq);
                }
                for (i = 0; i < enic->wq_count; i++)
-                       netif_napi_add(netdev, &enic->napi[enic_cq_wq(enic, i)],
-                                      enic_poll_msix_wq, NAPI_POLL_WEIGHT);
+                       netif_napi_add(netdev,
+                                      &enic->napi[enic_cq_wq(enic, i)],
+                                      enic_poll_msix_wq);
                break;
        }
 
index 6dae768671e3d40e9cdc23d874a7e0b56fca37a7..fdf10318758b4ffee8920d1dc52fedcebfc9bf2f 100644 (file)
@@ -2471,7 +2471,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
        netdev->max_mtu = 10236 - VLAN_ETH_HLEN;
 
        port->freeq_refill = 0;
-       netif_napi_add(netdev, &port->napi, gmac_napi_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &port->napi, gmac_napi_poll);
 
        ret = of_get_mac_address(np, mac);
        if (!ret) {
index 99e6f76f6cc03c4764b78c65addba26a26e9ce34..08184f20f5104243babaf7d5c0416ce31de2d26a 100644 (file)
@@ -788,7 +788,7 @@ static int dnet_probe(struct platform_device *pdev)
        }
 
        dev->netdev_ops = &dnet_netdev_ops;
-       netif_napi_add(dev, &bp->napi, dnet_poll, 64);
+       netif_napi_add(dev, &bp->napi, dnet_poll);
        dev->ethtool_ops = &dnet_ethtool_ops;
 
        dev->base_addr = (unsigned long)bp->regs;
index 414362febbb9d67509fc0a479290b59e40937fc3..a92a747615466a522b87c118e815a94f687f7ed6 100644 (file)
@@ -2982,8 +2982,7 @@ static int be_evt_queues_create(struct be_adapter *adapter)
                        return -ENOMEM;
                cpumask_set_cpu(cpumask_local_spread(i, numa_node),
                                eqo->affinity_mask);
-               netif_napi_add(adapter->netdev, &eqo->napi, be_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(adapter->netdev, &eqo->napi, be_poll);
        }
        return 0;
 }
index 19db8b1dddc46e48d49719af747084712582d17f..fbb0243661bc6bec8cfe075efeeb253c14e4e7f1 100644 (file)
@@ -899,7 +899,7 @@ static int tsnep_netdev_open(struct net_device *netdev)
 
        for (i = 0; i < adapter->num_queues; i++) {
                netif_napi_add(adapter->netdev, &adapter->queue[i].napi,
-                              tsnep_poll, 64);
+                              tsnep_poll);
                napi_enable(&adapter->queue[i].napi);
 
                tsnep_enable_irq(adapter, adapter->queue[i].irq_mask);
index 437c5acfe222cd86b9c8a46343c4a8882168fcd0..95cbad198b4b6ea113b0b5af7bbb8cde3b93d6fb 100644 (file)
@@ -1224,7 +1224,7 @@ static int ethoc_probe(struct platform_device *pdev)
        netdev->ethtool_ops = &ethoc_ethtool_ops;
 
        /* setup NAPI */
-       netif_napi_add(netdev, &priv->napi, ethoc_poll, 64);
+       netif_napi_add(netdev, &priv->napi, ethoc_poll);
 
        spin_lock_init(&priv->lock);
 
index da04beee58656fd8658f9c53e089c19c22e3cda6..a03879a27b0416da72abae5e054f056603e91f17 100644 (file)
@@ -1506,7 +1506,7 @@ static int ftgmac100_open(struct net_device *netdev)
                goto err_hw;
 
        /* Initialize NAPI */
-       netif_napi_add(netdev, &priv->napi, ftgmac100_poll, 64);
+       netif_napi_add(netdev, &priv->napi, ftgmac100_poll);
 
        /* Grab our interrupt */
        err = request_irq(netdev->irq, ftgmac100_interrupt, 0, netdev->name, netdev);
index bf6e664ffd43e83f70770697abe105dfa330ae50..d95d782308280ae94dba15da7f50e9e9716d6ff4 100644 (file)
@@ -1091,7 +1091,7 @@ static int ftmac100_probe(struct platform_device *pdev)
        spin_lock_init(&priv->tx_lock);
 
        /* initialize NAPI */
-       netif_napi_add(netdev, &priv->napi, ftmac100_poll, 64);
+       netif_napi_add(netdev, &priv->napi, ftmac100_poll);
 
        /* map io memory */
        priv->res = request_mem_region(res->start, resource_size(res),
index 0a180d17121c55253e1e6a5ead4c7126bb78cd0c..31cfa121333df3554f41366aa0437b1a20539d7c 100644 (file)
@@ -3183,8 +3183,7 @@ static int dpaa_napi_add(struct net_device *net_dev)
        for_each_possible_cpu(cpu) {
                percpu_priv = per_cpu_ptr(priv->percpu_priv, cpu);
 
-               netif_napi_add(net_dev, &percpu_priv->np.napi,
-                              dpaa_eth_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(net_dev, &percpu_priv->np.napi, dpaa_eth_poll);
        }
 
        return 0;
index 75d51572693d64fe42e2ab84483fe25754fe4490..8d029addddad0e5d1f2c28ba574af012c94a092c 100644 (file)
@@ -4565,8 +4565,7 @@ static void dpaa2_eth_add_ch_napi(struct dpaa2_eth_priv *priv)
        for (i = 0; i < priv->num_channels; i++) {
                ch = priv->channel[i];
                /* NAPI weight *MUST* be a multiple of DPAA2_ETH_STORE_SIZE */
-               netif_napi_add(priv->net_dev, &ch->napi, dpaa2_eth_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(priv->net_dev, &ch->napi, dpaa2_eth_poll);
        }
 }
 
index e507e90652148e68c14fced19d1bcac4f6b217db..2b5909fa93cfa47aee2bceffc8089283cd093372 100644 (file)
@@ -3373,9 +3373,8 @@ static int dpaa2_switch_probe(struct fsl_mc_device *sw_dev)
         * different queues for each switch ports.
         */
        for (i = 0; i < DPAA2_SWITCH_RX_NUM_FQS; i++)
-               netif_napi_add(ethsw->ports[0]->netdev,
-                              &ethsw->fq[i].napi, dpaa2_switch_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(ethsw->ports[0]->netdev, &ethsw->fq[i].napi,
+                              dpaa2_switch_poll);
 
        /* Setup IRQs */
        err = dpaa2_switch_setup_irqs(sw_dev);
index 9f5b921039bd4f5935b29d9030c24ac7c22e3068..54bdf599ea05ff9ba283a69d62eafe349d5c6717 100644 (file)
@@ -2759,8 +2759,7 @@ int enetc_alloc_msix(struct enetc_ndev_priv *priv)
                        v->rx_dim_en = true;
                }
                INIT_WORK(&v->rx_dim.work, enetc_rx_dim_work);
-               netif_napi_add(priv->ndev, &v->napi, enetc_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(priv->ndev, &v->napi, enetc_poll);
                v->count_tx_rings = v_tx_rings;
 
                for (j = 0; j < v_tx_rings; j++) {
index 59921218a8a4637540cba06a8f4f2f1a50f615e3..ff1950e96c6c073ba117ddd449b2fcce5d54ac0f 100644 (file)
@@ -3608,7 +3608,7 @@ static int fec_enet_init(struct net_device *ndev)
        ndev->ethtool_ops = &fec_enet_ethtool_ops;
 
        writel(FEC_RX_DISABLED_IMASK, fep->hwp + FEC_IMASK);
-       netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi);
 
        if (fep->quirks & FEC_QUIRK_HAS_VLAN)
                /* enable hw VLAN support */
index e7bf1524b68ee6b17667457e99eac8705840a6c2..b2def295523ab5ce23b547fae1a21b7662c25f17 100644 (file)
@@ -3233,7 +3233,7 @@ static int gfar_probe(struct platform_device *ofdev)
        /* Register for napi ...We are registering NAPI for each grp */
        for (i = 0; i < priv->num_grps; i++) {
                netif_napi_add(dev, &priv->gfargrp[i].napi_rx,
-                              gfar_poll_rx_sq, NAPI_POLL_WEIGHT);
+                              gfar_poll_rx_sq);
                netif_napi_add_tx_weight(dev, &priv->gfargrp[i].napi_tx,
                                         gfar_poll_tx_sq, 2);
        }
index 823221c912ab13161954793949596cb07eaabf7f..7a4cb4f07c32db19addf1217091538060a27b747 100644 (file)
@@ -3712,7 +3712,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
        dev->netdev_ops = &ucc_geth_netdev_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
        INIT_WORK(&ugeth->timeout_work, ucc_geth_timeout_work);
-       netif_napi_add(dev, &ugeth->napi, ucc_geth_poll, 64);
+       netif_napi_add(dev, &ugeth->napi, ucc_geth_poll);
        dev->mtu = 1500;
        dev->max_mtu = 1518;
 
index 6980455fb9095c57bef237e4bd90b4ec050f37b9..095f51c4d9d94b676923838318d0f37ba7c74766 100644 (file)
@@ -339,8 +339,7 @@ static int fun_alloc_queue_irqs(struct net_device *dev, unsigned int ntx,
                        return PTR_ERR(irq);
 
                fp->num_rx_irqs++;
-               netif_napi_add(dev, &irq->napi, fun_rxq_napi_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(dev, &irq->napi, fun_rxq_napi_poll);
        }
 
        netif_info(fp, intr, dev, "Reserved %u/%u IRQs for Tx/Rx queues\n",
index 044db3ebb071c100a03af0d25776e0007e6b93e5..d3e3ac242bfc31e5dbaba87ff299d42c17f90f37 100644 (file)
@@ -526,8 +526,7 @@ static void gve_add_napi(struct gve_priv *priv, int ntfy_idx,
 {
        struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
 
-       netif_napi_add(priv->dev, &block->napi, gve_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(priv->dev, &block->napi, gve_poll);
 }
 
 static void gve_remove_napi(struct gve_priv *priv, int ntfy_idx)
index ddeceb26fb790fc82904e454d8f561655b6aeefe..50c3f5d6611f055031804f17a9bfa2cc9fde7247 100644 (file)
@@ -990,7 +990,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
        ndev->watchdog_timeo = TX_TIMEOUT;
        ndev->priv_flags |= IFF_UNICAST_FLT;
        ndev->irq = irq;
-       netif_napi_add(ndev, &priv->napi, hip04_rx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, hip04_rx_poll);
 
        hip04_reset_dreq(priv);
        hip04_reset_ppe(priv);
index d7e62eca050f461080f2b5ea081991160499b976..ffcf797dfa90291ea2ee79925a207f2be37bcc64 100644 (file)
@@ -1243,7 +1243,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
        if (ret)
                goto out_phy_node;
 
-       netif_napi_add(ndev, &priv->napi, hix5hd2_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, hix5hd2_poll);
 
        if (HAS_CAP_TSO(priv->hw_cap)) {
                ret = hix5hd2_init_sg_desc_queue(priv);
index d94cc8c6681f7291e9e6bbdc519c25f8eb1516a9..7cf10d1e2b311732ed8c07b815628798a3c9e93d 100644 (file)
@@ -2109,8 +2109,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
                rd->fini_process = is_ver1 ? hns_nic_tx_fini_pro :
                        hns_nic_tx_fini_pro_v2;
 
-               netif_napi_add(priv->netdev, &rd->napi,
-                              hns_nic_common_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(priv->netdev, &rd->napi, hns_nic_common_poll);
                rd->ring->irq_init_flag = RCB_IRQ_NOT_INITED;
        }
        for (i = h->q_num; i < h->q_num * 2; i++) {
@@ -2122,8 +2121,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv)
                rd->fini_process = is_ver1 ? hns_nic_rx_fini_pro :
                        hns_nic_rx_fini_pro_v2;
 
-               netif_napi_add(priv->netdev, &rd->napi,
-                              hns_nic_common_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(priv->netdev, &rd->napi, hns_nic_common_poll);
                rd->ring->irq_init_flag = RCB_IRQ_NOT_INITED;
        }
 
index 39b75b68474cdca0e66ca8e9396192481f529048..4cb2421e71a755026a45d3ec01743f673a4adce9 100644 (file)
@@ -4692,7 +4692,7 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv)
                        goto map_ring_fail;
 
                netif_napi_add(priv->netdev, &tqp_vector->napi,
-                              hns3_nic_common_poll, NAPI_POLL_WEIGHT);
+                              hns3_nic_common_poll);
        }
 
        return 0;
index 5dc302880f5f621d8906748191bcd6341c0e3aa1..294bdbbeacc335ff261d85b5c2c17faf2497f87c 100644 (file)
@@ -1546,7 +1546,7 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,
 
        kfree(init_attr);
 
-       netif_napi_add(pr->port->netdev, &pr->napi, ehea_poll, 64);
+       netif_napi_add(pr->port->netdev, &pr->napi, ehea_poll);
 
        ret = 0;
        goto out;
index 5ab7c0f81e9afc9ec6230325cb9bac71ca33f34b..65dbfbec487a34b6af65538434c0d429e9fade46 100644 (file)
@@ -1262,7 +1262,7 @@ static int init_napi(struct ibmvnic_adapter *adapter)
        for (i = 0; i < adapter->req_rx_queues; i++) {
                netdev_dbg(adapter->netdev, "Adding napi[%d]\n", i);
                netif_napi_add(adapter->netdev, &adapter->napi[i],
-                              ibmvnic_poll, NAPI_POLL_WEIGHT);
+                              ibmvnic_poll);
        }
 
        adapter->num_active_rx_napi = adapter->req_rx_queues;
index 23299fc561999ad435863d5d19f1fffbfb56635b..61e60e4de600fb2059f6a01b47e87cb199a03c09 100644 (file)
@@ -1012,7 +1012,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->netdev_ops = &e1000_netdev_ops;
        e1000_set_ethtool_ops(netdev);
        netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
+       netif_napi_add(netdev, &adapter->napi, e1000_clean);
 
        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
index 56984803c9572146fc23704014375ebcb110fefc..49e926959ad32e28e8850a58fee10bf5bb243954 100644 (file)
@@ -7479,7 +7479,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->netdev_ops = &e1000e_netdev_ops;
        e1000e_set_ethtool_ops(netdev);
        netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, e1000e_poll, 64);
+       netif_napi_add(netdev, &adapter->napi, e1000e_poll);
        strscpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
 
        netdev->mem_start = mmio_start;
index 3362f26d7f9999fd4a9129e92c9ae59400f7fe61..4a6630586ec98aa51d7b8870cc861ea1d0a97d65 100644 (file)
@@ -1595,8 +1595,7 @@ static int fm10k_alloc_q_vector(struct fm10k_intfc *interface,
                return -ENOMEM;
 
        /* initialize NAPI */
-       netif_napi_add(interface->netdev, &q_vector->napi,
-                      fm10k_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(interface->netdev, &q_vector->napi, fm10k_poll);
 
        /* tie q_vector and interface together */
        interface->q_vector[v_idx] = q_vector;
index 3c8b70d31232ea95033c5ef983bc9faa908832f0..2c07fa8ecfc8021625f6c33991f0516824e69c2b 100644 (file)
@@ -11941,8 +11941,7 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
        cpumask_copy(&q_vector->affinity_mask, cpu_possible_mask);
 
        if (vsi->netdev)
-               netif_napi_add(vsi->netdev, &q_vector->napi,
-                              i40e_napi_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(vsi->netdev, &q_vector->napi, i40e_napi_poll);
 
        /* tie q_vector and vsi together */
        vsi->q_vectors[v_idx] = q_vector;
index 79fef8c59d652834503e16dee5cd9a30cb1bd176..3fc572341781b0331649ebea83e11c70890bddf9 100644 (file)
@@ -1831,7 +1831,7 @@ static int iavf_alloc_q_vectors(struct iavf_adapter *adapter)
                q_vector->reg_idx = q_idx;
                cpumask_copy(&q_vector->affinity_mask, cpu_possible_mask);
                netif_napi_add(adapter->netdev, &q_vector->napi,
-                              iavf_napi_poll, NAPI_POLL_WEIGHT);
+                              iavf_napi_poll);
        }
 
        return 0;
index 1e97242a8f857a5a13511f584e16be3eb0be433b..9e36f01dfa4fb70c2d3ec7e3e0876b2bf3deadeb 100644 (file)
@@ -130,8 +130,7 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)
         * handler here (i.e. resume, reset/rebuild, etc.)
         */
        if (vsi->netdev)
-               netif_napi_add(vsi->netdev, &q_vector->napi, ice_napi_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(vsi->netdev, &q_vector->napi, ice_napi_poll);
 
 out:
        /* tie q_vector and VSI together */
index e35371e61e078538fc8b067506a31e510c368374..f9f15acae90a0536ed024d07c54ee125fde45a96 100644 (file)
@@ -292,8 +292,8 @@ static int ice_eswitch_setup_reprs(struct ice_pf *pf)
                if (max_vsi_num < vsi->vsi_num)
                        max_vsi_num = vsi->vsi_num;
 
-               netif_napi_add(vf->repr->netdev, &vf->repr->q_vector->napi, ice_napi_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(vf->repr->netdev, &vf->repr->q_vector->napi,
+                              ice_napi_poll);
 
                netif_keep_dst(vf->repr->netdev);
        }
index 747f27c4e761407a78cd08c1cb913197c958ba80..0f6718719453dd4d00e31db51b4762cbf991da39 100644 (file)
@@ -3310,7 +3310,7 @@ static void ice_napi_add(struct ice_vsi *vsi)
 
        ice_for_each_q_vector(vsi, v_idx)
                netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,
-                              ice_napi_poll, NAPI_POLL_WEIGHT);
+                              ice_napi_poll);
 }
 
 /**
index ff0c7f0bf07ac329aef9c2d6eceb75ab705762e0..f8e32833226c1b5cb8558ae57ccf8201c2a4fb9b 100644 (file)
@@ -1211,8 +1211,7 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
                return -ENOMEM;
 
        /* initialize NAPI */
-       netif_napi_add(adapter->netdev, &q_vector->napi,
-                      igb_poll, 64);
+       netif_napi_add(adapter->netdev, &q_vector->napi, igb_poll);
 
        /* tie q_vector and adapter together */
        adapter->q_vector[v_idx] = q_vector;
index f4e91db89fe5aeb05f7d5ff68c3eaf50939f5e6f..3a32809510fc6b771c2a350e5bed9aa3a5bb1a48 100644 (file)
@@ -1109,7 +1109,7 @@ static int igbvf_alloc_queues(struct igbvf_adapter *adapter)
                return -ENOMEM;
        }
 
-       netif_napi_add(netdev, &adapter->rx_ring->napi, igbvf_poll, 64);
+       netif_napi_add(netdev, &adapter->rx_ring->napi, igbvf_poll);
 
        return 0;
 }
index bf6c461e1a2a995f2882dd5409eecad024a4efc0..34889be63e788f8addc2e4704857c241e8e96f3d 100644 (file)
@@ -4394,8 +4394,7 @@ static int igc_alloc_q_vector(struct igc_adapter *adapter,
                return -ENOMEM;
 
        /* initialize NAPI */
-       netif_napi_add(adapter->netdev, &q_vector->napi,
-                      igc_poll, 64);
+       netif_napi_add(adapter->netdev, &q_vector->napi, igc_poll);
 
        /* tie q_vector and adapter together */
        adapter->q_vector[v_idx] = q_vector;
index 45be9a1ab6af2fede53f9c97a01c230bda52d6ed..b4d47e7a76c8cf91add4adbc8f0bce54f68930ec 100644 (file)
@@ -414,7 +414,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->netdev_ops = &ixgb_netdev_ops;
        ixgb_set_ethtool_ops(netdev);
        netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, ixgb_clean, 64);
+       netif_napi_add(netdev, &adapter->napi, ixgb_clean);
 
        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
index 86b11164655e2112c9b885c8e8d34ace093fda9f..f8156fe4b1dc41c56861cb1d670c73a1d70d5bd0 100644 (file)
@@ -874,8 +874,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,
 
 #endif
        /* initialize NAPI */
-       netif_napi_add(adapter->netdev, &q_vector->napi,
-                      ixgbe_poll, 64);
+       netif_napi_add(adapter->netdev, &q_vector->napi, ixgbe_poll);
 
        /* tie q_vector and adapter together */
        adapter->q_vector[v_idx] = q_vector;
index 2f12fbe229c1588452d7b9fee5bd36eb2c23332a..99933e89717ad9a936bd742e22a8493bcf33fb1f 100644 (file)
@@ -2733,7 +2733,7 @@ static int ixgbevf_alloc_q_vector(struct ixgbevf_adapter *adapter, int v_idx,
                return -ENOMEM;
 
        /* initialize NAPI */
-       netif_napi_add(adapter->netdev, &q_vector->napi, ixgbevf_poll, 64);
+       netif_napi_add(adapter->netdev, &q_vector->napi, ixgbevf_poll);
 
        /* tie q_vector and adapter together */
        adapter->q_vector[v_idx] = q_vector;
index b5659440796564f9a0860b81f32a3016fb2f49ef..1732ec3c3dbdc4767a6e48296f9219f588f9e643 100644 (file)
@@ -3009,7 +3009,7 @@ jme_init_one(struct pci_dev *pdev,
                jwrite32(jme, JME_APMC, apmc);
        }
 
-       netif_napi_add(netdev, &jme->napi, jme_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &jme->napi, jme_poll);
 
        spin_lock_init(&jme->phy_lock);
        spin_lock_init(&jme->macaddr_lock);
index 27194398d8baf1c9a5857b2cbdd6e4dda6074d26..2b9335cb4bb3a1896643268bb1704d3091d08442 100644 (file)
@@ -1355,7 +1355,7 @@ static int korina_probe(struct platform_device *pdev)
        dev->netdev_ops = &korina_netdev_ops;
        dev->ethtool_ops = &netdev_ethtool_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
-       netif_napi_add(dev, &lp->napi, korina_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &lp->napi, korina_poll);
 
        lp->mii_if.dev = dev;
        lp->mii_if.mdio_read = korina_mdio_read;
index 57f27cc7724e7b63873b3205e42a08bd3a30a697..8d646c7f8c823670ace5fedb85cbd25076e51a7e 100644 (file)
@@ -620,8 +620,7 @@ static int xrx200_probe(struct platform_device *pdev)
                         PMAC_HD_CTL);
 
        /* setup NAPI */
-       netif_napi_add(net_dev, &priv->chan_rx.napi, xrx200_poll_rx,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(net_dev, &priv->chan_rx.napi, xrx200_poll_rx);
        netif_napi_add_tx(net_dev, &priv->chan_tx.napi,
                          xrx200_tx_housekeeping);
 
index 8b9abe6224891932d8d3ee96cbf680e3ee8cc125..707993b445d1e2ff0baea4d7943949364a56fbc0 100644 (file)
@@ -3183,7 +3183,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
        INIT_WORK(&mp->tx_timeout_task, tx_timeout_task);
 
-       netif_napi_add(dev, &mp->napi, mv643xx_eth_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &mp->napi, mv643xx_eth_poll);
 
        timer_setup(&mp->rx_oom, oom_timer_wrapper, 0);
 
index b500fe1dfa81e23eac65dcbfcb8fe1efc6a43725..ff3e361e06e781b413d20e1b9b215643e7a15e40 100644 (file)
@@ -5600,14 +5600,13 @@ static int mvneta_probe(struct platform_device *pdev)
         * operation, so only single NAPI should be initialized.
         */
        if (pp->neta_armada3700) {
-               netif_napi_add(dev, &pp->napi, mvneta_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(dev, &pp->napi, mvneta_poll);
        } else {
                for_each_present_cpu(cpu) {
                        struct mvneta_pcpu_port *port =
                                per_cpu_ptr(pp->ports, cpu);
 
-                       netif_napi_add(dev, &port->napi, mvneta_poll,
-                                      NAPI_POLL_WEIGHT);
+                       netif_napi_add(dev, &port->napi, mvneta_poll);
                        port->pp = pp;
                }
        }
index 38e5b4be6a4d2f053253ba7f465aa140e80f22fb..daa890d6993e200cb38c9945a3c46ab1d948505d 100644 (file)
@@ -5770,8 +5770,7 @@ static int mvpp2_simple_queue_vectors_init(struct mvpp2_port *port,
        v->irq = irq_of_parse_and_map(port_node, 0);
        if (v->irq <= 0)
                return -EINVAL;
-       netif_napi_add(port->dev, &v->napi, mvpp2_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(port->dev, &v->napi, mvpp2_poll);
 
        port->nqvecs = 1;
 
@@ -5831,8 +5830,7 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port,
                        goto err;
                }
 
-               netif_napi_add(port->dev, &v->napi, mvpp2_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(port->dev, &v->napi, mvpp2_poll);
        }
 
        return 0;
index 97f080c66dd478814bf047cfe0dede30df5b8e09..9089adcb75f92be857fae13006437d7c27035312 100644 (file)
@@ -410,7 +410,7 @@ static void octep_napi_add(struct octep_device *oct)
        for (i = 0; i < oct->num_oqs; i++) {
                netdev_dbg(oct->netdev, "Adding NAPI on Q-%d\n", i);
                netif_napi_add(oct->netdev, &oct->ioq_vector[i]->napi,
-                              octep_napi_poll, 64);
+                              octep_napi_poll);
                oct->oq[i]->napi = &oct->ioq_vector[i]->napi;
        }
 }
index 88ce472959b013e899b96891019236a49d2642d9..fa9348d6a4f468eb006199132b0fa9536e0b518b 100644 (file)
@@ -1661,8 +1661,7 @@ int otx2_open(struct net_device *netdev)
                cq_poll->dev = (void *)pf;
                cq_poll->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_CQE;
                INIT_WORK(&cq_poll->dim.work, otx2_dim_work);
-               netif_napi_add(netdev, &cq_poll->napi,
-                              otx2_napi_handler, NAPI_POLL_WEIGHT);
+               netif_napi_add(netdev, &cq_poll->napi, otx2_napi_handler);
                napi_enable(&cq_poll->napi);
        }
 
index dc3e3ddc60bf5d5f39c3880bcb3bebd188e266e0..42ee963e9f75967a2392defa36f60baef4a2de3d 100644 (file)
@@ -659,7 +659,7 @@ static int prestera_sdma_switch_init(struct prestera_switch *sw)
 
        init_dummy_netdev(&sdma->napi_dev);
 
-       netif_napi_add(&sdma->napi_dev, &sdma->rx_napi, prestera_sdma_rx_poll, 64);
+       netif_napi_add(&sdma->napi_dev, &sdma->rx_napi, prestera_sdma_rx_poll);
        napi_enable(&sdma->rx_napi);
 
        return 0;
index bcc4aa59d10ac7f31c5731d4fe3493de4170f763..1b43704baceb5284a20ed323a06ec81d5e9318c7 100644 (file)
@@ -3832,7 +3832,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
                dev->features |= NETIF_F_HIGHDMA;
 
        skge = netdev_priv(dev);
-       netif_napi_add(dev, &skge->napi, skge_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &skge->napi, skge_poll);
        skge->netdev = dev;
        skge->hw = hw;
        skge->msg_enable = netif_msg_init(debug, default_msg);
index e19acfcd84d4b5c2965b0b1c20172e82d35f4afc..ab33ba1c3023c47f8fb9e7574a8a5ab12e8918d7 100644 (file)
@@ -4937,7 +4937,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                }
        }
 
-       netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &hw->napi, sky2_poll);
 
        err = register_netdev(dev);
        if (err) {
index 49b7e8c1f4bde86309d05ea4a9ba15957cbe7ff8..4fba7cb0144bae7e4f4b942a3832a325700bffff 100644 (file)
@@ -4166,10 +4166,8 @@ static int mtk_probe(struct platform_device *pdev)
         * for NAPI to work
         */
        init_dummy_netdev(&eth->dummy_dev);
-       netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx,
-                      NAPI_POLL_WEIGHT);
-       netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx);
+       netif_napi_add(&eth->dummy_dev, &eth->rx_napi, mtk_napi_rx);
 
        platform_set_drvdata(pdev, eth);
 
index f8db176c71aeb856a15a39f1033c564c03f0a479..7e890f81148e6a8f7c625b4399d9fa44f8e81c0f 100644 (file)
@@ -1651,8 +1651,7 @@ static int mtk_star_probe(struct platform_device *pdev)
        ndev->netdev_ops = &mtk_star_netdev_ops;
        ndev->ethtool_ops = &mtk_star_ethtool_ops;
 
-       netif_napi_add(ndev, &priv->rx_napi, mtk_star_rx_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->rx_napi, mtk_star_rx_poll);
        netif_napi_add_tx(ndev, &priv->tx_napi, mtk_star_tx_poll);
 
        return devm_register_netdev(dev, ndev);
index 6affbd241264a1493e04d93f01f1ec0e78756170..1184ac5751e1becb8c50ab9cbe9358aea50ba5c0 100644 (file)
@@ -152,7 +152,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
                break;
        case RX:
                cq->mcq.comp = mlx4_en_rx_irq;
-               netif_napi_add(cq->dev, &cq->napi, mlx4_en_poll_rx_cq, 64);
+               netif_napi_add(cq->dev, &cq->napi, mlx4_en_poll_rx_cq);
                napi_enable(&cq->napi);
                break;
        case TX_XDP:
index 6fefce30d296ab5bb4dd1b3e597a348d24a731ff..8469e9c38670653499a2355c50b319491ae39460 100644 (file)
@@ -725,7 +725,7 @@ int mlx5e_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params,
        if (err)
                goto err_free;
 
-       netif_napi_add(netdev, &c->napi, mlx5e_ptp_napi_poll, 64);
+       netif_napi_add(netdev, &c->napi, mlx5e_ptp_napi_poll);
 
        mlx5e_ptp_build_params(c, cparams, params);
 
index 46c2e5f9c05c441010a2ec32c65f51a0fd84cdba..201ac7dd338f06181f778000a3e43e363af6484d 100644 (file)
@@ -147,7 +147,7 @@ static struct mlx5e_trap *mlx5e_open_trap(struct mlx5e_priv *priv)
        t->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.hw_objs.mkey);
        t->stats    = &priv->trap_stats.ch;
 
-       netif_napi_add(netdev, &t->napi, mlx5e_trap_napi_poll, 64);
+       netif_napi_add(netdev, &t->napi, mlx5e_trap_napi_poll);
 
        err = mlx5e_open_trap_rq(priv, t);
        if (unlikely(err))
index 4503de92ac801e1d9fc8551ac2c9a8288832f6f6..099a69d0ee4a8cf0dbb2eab37d6f7b72a7f6f630 100644 (file)
@@ -2281,7 +2281,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
        c->aff_mask = irq_get_effective_affinity_mask(irq);
        c->lag_port = mlx5e_enumerate_lag_port(priv->mdev, ix);
 
-       netif_napi_add(netdev, &c->napi, mlx5e_napi_poll, 64);
+       netif_napi_add(netdev, &c->napi, mlx5e_napi_poll);
 
        err = mlx5e_open_queues(c, params, cparam);
        if (unlikely(err))
index b03e1c66bac0d9be9aa0154e52fb344bde7f82c4..2292d63a279c19a29117bd436760819dcfac6faf 100644 (file)
@@ -156,7 +156,7 @@ static int mlxbf_gige_open(struct net_device *netdev)
 
        phy_start(phydev);
 
-       netif_napi_add(netdev, &priv->napi, mlxbf_gige_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &priv->napi, mlxbf_gige_poll);
        napi_enable(&priv->napi);
        netif_start_queue(netdev);
 
index 2599dfffd1da448de328537c98e6d01f891d8728..50eeecba1f18d1586c77642437f4a7f8f12585d5 100644 (file)
@@ -2875,9 +2875,7 @@ static int lan743x_rx_open(struct lan743x_rx *rx)
        if (ret)
                goto return_error;
 
-       netif_napi_add(adapter->netdev,
-                      &rx->napi, lan743x_rx_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(adapter->netdev, &rx->napi, lan743x_rx_napi_poll);
 
        lan743x_csr_write(adapter, DMAC_CMD,
                          DMAC_CMD_RX_SWR_(rx->channel_number));
index 51f8a081637778976cac2fabd2246bda991bb1ce..7e4061c854f0e2115a3c67765aa4647f545986ac 100644 (file)
@@ -787,8 +787,7 @@ void lan966x_fdma_netdev_init(struct lan966x *lan966x, struct net_device *dev)
                return;
 
        lan966x->fdma_ndev = dev;
-       netif_napi_add(dev, &lan966x->napi, lan966x_fdma_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &lan966x->napi, lan966x_fdma_napi_poll);
        napi_enable(&lan966x->napi);
 }
 
index 518b664a6908989ce389c90878913e2c03598449..650a5a16607012b832c678a0e7417e93770c0c97 100644 (file)
@@ -869,7 +869,7 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
        np = netdev_priv(dev);
        np->ioaddr = ioaddr;
 
-       netif_napi_add(dev, &np->napi, natsemi_poll, 64);
+       netif_napi_add(dev, &np->napi, natsemi_poll);
        np->dev = dev;
 
        np->pci_dev = pdev;
index d8a77b0db50dc9d603c349c6d7261c93511ba5a8..804354e932d77324eb3797b15bf32a5aad0afdde 100644 (file)
@@ -7905,10 +7905,10 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                for (i = 0; i < config->rx_ring_num ; i++) {
                        struct ring_info *ring = &mac_control->rings[i];
 
-                       netif_napi_add(dev, &ring->napi, s2io_poll_msix, 64);
+                       netif_napi_add(dev, &ring->napi, s2io_poll_msix);
                }
        } else {
-               netif_napi_add(dev, &sp->napi, s2io_poll_inta, 64);
+               netif_napi_add(dev, &sp->napi, s2io_poll_inta);
        }
 
        /* Not needed for Herc */
index 469c3939c3069e607dedd3e5ee21c19b6489cc31..27f4786ace4fbbb38253273808146c4ca8668c22 100644 (file)
@@ -771,9 +771,7 @@ nfp_net_napi_add(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec, int idx)
 {
        if (dp->netdev)
                netif_napi_add(dp->netdev, &r_vec->napi,
-                              nfp_net_has_xsk_pool_slow(dp, idx) ?
-                              dp->ops->xsk_poll : dp->ops->poll,
-                              NAPI_POLL_WEIGHT);
+                              nfp_net_has_xsk_pool_slow(dp, idx) ? dp->ops->xsk_poll : dp->ops->poll);
        else
                tasklet_enable(&r_vec->tasklet);
 }
index cf2929fa525e3454637fba9475cb9886b70451bf..3db4a243174194bdc25f880f4cd6a4f6c939aac5 100644 (file)
@@ -1294,7 +1294,7 @@ static int nixge_probe(struct platform_device *pdev)
        priv->ndev = ndev;
        priv->dev = &pdev->dev;
 
-       netif_napi_add(ndev, &priv->napi, nixge_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, nixge_poll);
        err = nixge_of_get_resources(pdev);
        if (err)
                goto free_netdev;
index 7c0675ca337b29396ec22d7da9f62a50b4727a88..daa028729d444a7b51f056868d4b12e92acf6adf 100644 (file)
@@ -5876,7 +5876,7 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
        else
                dev->netdev_ops = &nv_netdev_ops_optimized;
 
-       netif_napi_add(dev, &np->napi, nv_napi_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &np->napi, nv_napi_poll);
        dev->ethtool_ops = &ops;
        dev->watchdog_timeo = NV_WATCHDOG_TIMEO;
 
index 46da937ad27f80e65b717286705aea93099d1dfc..3f2c30184752d88fa170c0a71cf083ba75b84312 100644 (file)
@@ -2516,8 +2516,7 @@ static int pch_gbe_probe(struct pci_dev *pdev,
 
        netdev->netdev_ops = &pch_gbe_netdev_ops;
        netdev->watchdog_timeo = PCH_GBE_WATCHDOG_PERIOD;
-       netif_napi_add(netdev, &adapter->napi,
-                      pch_gbe_napi_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &adapter->napi, pch_gbe_napi_poll);
        netdev->hw_features = NETIF_F_RXCSUM |
                NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
        netdev->features = netdev->hw_features;
index f0ace3a0e85cb70b42554498283cfaf58c3b05a1..aaab590ef548de1a63734c57171f066868c1e85d 100644 (file)
@@ -1697,7 +1697,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        mac->pdev = pdev;
        mac->netdev = dev;
 
-       netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
+       netif_napi_add(dev, &mac->napi, pasemi_mac_poll);
 
        dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |
                        NETIF_F_HIGHDMA | NETIF_F_GSO;
index 0be79c51678133c7b98668d1670cfeeb54bafb85..5d58fd99be3cf2ecf0e03fb544ae58ae493cdc2c 100644 (file)
@@ -774,8 +774,7 @@ static int ionic_lif_txq_init(struct ionic_lif *lif, struct ionic_qcq *qcq)
        dev_dbg(dev, "txq->hw_index %d\n", q->hw_index);
 
        if (test_bit(IONIC_LIF_F_SPLIT_INTR, lif->state))
-               netif_napi_add(lif->netdev, &qcq->napi, ionic_tx_napi,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(lif->netdev, &qcq->napi, ionic_tx_napi);
 
        qcq->flags |= IONIC_QCQ_F_INITED;
 
@@ -830,11 +829,9 @@ static int ionic_lif_rxq_init(struct ionic_lif *lif, struct ionic_qcq *qcq)
        dev_dbg(dev, "rxq->hw_index %d\n", q->hw_index);
 
        if (test_bit(IONIC_LIF_F_SPLIT_INTR, lif->state))
-               netif_napi_add(lif->netdev, &qcq->napi, ionic_rx_napi,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(lif->netdev, &qcq->napi, ionic_rx_napi);
        else
-               netif_napi_add(lif->netdev, &qcq->napi, ionic_txrx_napi,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(lif->netdev, &qcq->napi, ionic_txrx_napi);
 
        qcq->flags |= IONIC_QCQ_F_INITED;
 
@@ -3165,8 +3162,7 @@ static int ionic_lif_adminq_init(struct ionic_lif *lif)
        dev_dbg(dev, "adminq->hw_type %d\n", q->hw_type);
        dev_dbg(dev, "adminq->hw_index %d\n", q->hw_index);
 
-       netif_napi_add(lif->netdev, &qcq->napi, ionic_adminq_napi,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(lif->netdev, &qcq->napi, ionic_adminq_napi);
 
        napi_enable(&qcq->napi);
 
index 4e6f00af17d92ed2fcac1c8df5d90cb3c55219a6..de8d54b23f7385238196c684fa030c98756ff933 100644 (file)
@@ -173,8 +173,7 @@ netxen_napi_add(struct netxen_adapter *adapter, struct net_device *netdev)
 
        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                sds_ring = &recv_ctx->sds_rings[ring];
-               netif_napi_add(netdev, &sds_ring->napi,
-                               netxen_nic_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(netdev, &sds_ring->napi, netxen_nic_poll);
        }
 
        return 0;
index 3c1bfff291576763c7951a9a9b6c8f077f6694cd..953f304b8588c58c35eda919b385621ee2951ba1 100644 (file)
@@ -1904,8 +1904,7 @@ static void qede_napi_add_enable(struct qede_dev *edev)
 
        /* Add NAPI objects */
        for_each_queue(i) {
-               netif_napi_add(edev->ndev, &edev->fp_array[i].napi,
-                              qede_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(edev->ndev, &edev->fp_array[i].napi, qede_poll);
                napi_enable(&edev->fp_array[i].napi);
        }
 }
index 31e3ab14972792072ecebb93757ee476d2f3cc19..76072f8c3d2fbcdbecd3a35aee734cc2cc9b26ff 100644 (file)
@@ -3813,7 +3813,7 @@ static int ql3xxx_probe(struct pci_dev *pdev,
        ndev->ethtool_ops = &ql3xxx_ethtool_ops;
        ndev->watchdog_timeo = 5 * HZ;
 
-       netif_napi_add(ndev, &qdev->napi, ql_poll, 64);
+       netif_napi_add(ndev, &qdev->napi, ql_poll);
 
        ndev->irq = pdev->irq;
 
index 9da5e97f8a0ada4a1f38f3255ec024665f288173..92930a055cbcc84a9f60e6acb3903d99f046c171 100644 (file)
@@ -1586,17 +1586,15 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
                sds_ring = &recv_ctx->sds_rings[ring];
                if (qlcnic_check_multi_tx(adapter) &&
                    !adapter->ahw->diag_test) {
-                       netif_napi_add(netdev, &sds_ring->napi, qlcnic_rx_poll,
-                                      NAPI_POLL_WEIGHT);
+                       netif_napi_add(netdev, &sds_ring->napi,
+                                      qlcnic_rx_poll);
                } else {
                        if (ring == (adapter->drv_sds_rings - 1))
                                netif_napi_add(netdev, &sds_ring->napi,
-                                              qlcnic_poll,
-                                              NAPI_POLL_WEIGHT);
+                                              qlcnic_poll);
                        else
                                netif_napi_add(netdev, &sds_ring->napi,
-                                              qlcnic_rx_poll,
-                                              NAPI_POLL_WEIGHT);
+                                              qlcnic_rx_poll);
                }
        }
 
@@ -2115,17 +2113,14 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
                if (adapter->flags & QLCNIC_MSIX_ENABLED) {
                        if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
                                netif_napi_add(netdev, &sds_ring->napi,
-                                              qlcnic_83xx_rx_poll,
-                                              NAPI_POLL_WEIGHT);
+                                              qlcnic_83xx_rx_poll);
                        else
                                netif_napi_add(netdev, &sds_ring->napi,
-                                              qlcnic_83xx_msix_sriov_vf_poll,
-                                              NAPI_POLL_WEIGHT);
+                                              qlcnic_83xx_msix_sriov_vf_poll);
 
                } else {
                        netif_napi_add(netdev, &sds_ring->napi,
-                                      qlcnic_83xx_poll,
-                                      NAPI_POLL_WEIGHT);
+                                      qlcnic_83xx_poll);
                }
        }
 
index a55c52696d49f6a97a8532bd2108896a7609f0e4..3115b2c128980db23bf85851fa9724a5359f0509 100644 (file)
@@ -684,8 +684,7 @@ static int emac_probe(struct platform_device *pdev)
        /* Initialize queues */
        emac_mac_rx_tx_ring_init_all(pdev, adpt);
 
-       netif_napi_add(netdev, &adpt->rx_q.napi, emac_napi_rtx,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &adpt->rx_q.napi, emac_napi_rtx);
 
        ret = register_netdev(netdev);
        if (ret) {
index 1aac2c3e5e0dd9108c1979c0040252853a8214ca..eecd52ed1ed21869c073ed74db8e192866e026cf 100644 (file)
@@ -1127,7 +1127,7 @@ static int r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev->ethtool_ops = &netdev_ethtool_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
 
-       netif_napi_add(dev, &lp->napi, r6040_poll, 64);
+       netif_napi_add(dev, &lp->napi, r6040_poll);
 
        lp->mii_bus = mdiobus_alloc();
        if (!lp->mii_bus) {
index ab424b5b4920fc7155c596dfeda6e5321676383f..469e2e229c6e7e2781bb09b4b45fece809c76c51 100644 (file)
@@ -1002,7 +1002,7 @@ static int rtl8139_init_one(struct pci_dev *pdev,
        dev->netdev_ops = &rtl8139_netdev_ops;
        dev->ethtool_ops = &rtl8139_ethtool_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
-       netif_napi_add(dev, &tp->napi, rtl8139_poll, 64);
+       netif_napi_add(dev, &tp->napi, rtl8139_poll);
 
        /* note: the hardware is not capable of sg/csum/highdma, however
         * through the use of skb_copy_and_csum_dev we enable these
index 9c21894d051886f1b3f19873b9c16755ce1b20e5..3ec6d1319a8a9a1b0ca6cbf42c4e108405f0608d 100644 (file)
@@ -5240,7 +5240,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        dev->ethtool_ops = &rtl8169_ethtool_ops;
 
-       netif_napi_add(dev, &tp->napi, rtl8169_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &tp->napi, rtl8169_poll);
 
        dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
                           NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
index c992bf1c711e103478d2c49028a556cd6a2e6934..36324126db6db5998846031bf2ca0d2da6217ae1 100644 (file)
@@ -2841,9 +2841,9 @@ static int ravb_probe(struct platform_device *pdev)
                goto out_dma_free;
        }
 
-       netif_napi_add(ndev, &priv->napi[RAVB_BE], ravb_poll, 64);
+       netif_napi_add(ndev, &priv->napi[RAVB_BE], ravb_poll);
        if (info->nc_queues)
-               netif_napi_add(ndev, &priv->napi[RAVB_NC], ravb_poll, 64);
+               netif_napi_add(ndev, &priv->napi[RAVB_NC], ravb_poll);
 
        /* Network device register */
        error = register_netdev(ndev);
index 7fd8828d3a8461690b0771bab6a7027585900084..71a4991133080fac9bbbbc20437a09025795fc6d 100644 (file)
@@ -3368,7 +3368,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
                goto out_release;
        }
 
-       netif_napi_add(ndev, &mdp->napi, sh_eth_poll, 64);
+       netif_napi_add(ndev, &mdp->napi, sh_eth_poll);
 
        /* network device register */
        ret = register_netdev(ndev);
index 9e7b62750bb06b8b4476bf32717377f05de3180a..023682cd27687220b3bebd4ffdb67feafcb5e106 100644 (file)
@@ -2574,8 +2574,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
        dev->netdev_ops = &rocker_port_netdev_ops;
        dev->ethtool_ops = &rocker_port_ethtool_ops;
        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);
+       netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx);
        rocker_carrier_init(rocker_port);
 
        dev->features |= NETIF_F_NETNS_LOCAL | NETIF_F_SG;
index a1c10b61269b0a3eee29b2743b5977b5463635c8..9664f029fa161c08d941500d47fe25957cc72cb5 100644 (file)
@@ -2143,7 +2143,7 @@ struct sxgbe_priv_data *sxgbe_drv_probe(struct device *device,
                pr_info("Enable RX Mitigation via HW Watchdog Timer\n");
        }
 
-       netif_napi_add(ndev, &priv->napi, sxgbe_poll, 64);
+       netif_napi_add(ndev, &priv->napi, sxgbe_poll);
 
        spin_lock_init(&priv->stats_lock);
 
index 869f806a6b6781409d0cc7935c5f487381b57c80..81ab22c746355280ff31a01254810f1ff0c123ea 100644 (file)
@@ -43,8 +43,7 @@ static int efx_ef100_rep_open(struct net_device *net_dev)
 {
        struct efx_rep *efv = netdev_priv(net_dev);
 
-       netif_napi_add(net_dev, &efv->napi, efx_ef100_rep_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(net_dev, &efv->napi, efx_ef100_rep_poll);
        napi_enable(&efv->napi);
        return 0;
 }
index 5b4d661ab98679d25aa58fd061d642674e1db309..aaa381743bca38a8adb21ce072f73d2a592f3bfc 100644 (file)
@@ -1313,7 +1313,7 @@ void efx_init_napi_channel(struct efx_channel *channel)
        struct efx_nic *efx = channel->efx;
 
        channel->napi_dev = efx->net_dev;
-       netif_napi_add(channel->napi_dev, &channel->napi_str, efx_poll, 64);
+       netif_napi_add(channel->napi_dev, &channel->napi_str, efx_poll);
 }
 
 void efx_init_napi(struct efx_nic *efx)
index f18418e07eb864323b5987a21cb3df66f910ecc6..e151b0957751741f96870d9184f9049f51272016 100644 (file)
@@ -2012,7 +2012,7 @@ static void ef4_init_napi_channel(struct ef4_channel *channel)
        struct ef4_nic *efx = channel->efx;
 
        channel->napi_dev = efx->net_dev;
-       netif_napi_add(channel->napi_dev, &channel->napi_str, ef4_poll, 64);
+       netif_napi_add(channel->napi_dev, &channel->napi_str, ef4_poll);
 }
 
 static void ef4_init_napi(struct ef4_nic *efx)
index f54ebd007286826bf2bf25742c37e192d1c37d7c..06ed74994e366201ec468e2fd05ff14f474b8e7f 100644 (file)
@@ -1317,7 +1317,7 @@ static void efx_init_napi_channel(struct efx_channel *channel)
        struct efx_nic *efx = channel->efx;
 
        channel->napi_dev = efx->net_dev;
-       netif_napi_add(channel->napi_dev, &channel->napi_str, efx_poll, 64);
+       netif_napi_add(channel->napi_dev, &channel->napi_str, efx_poll);
 }
 
 void efx_siena_init_napi(struct efx_nic *efx)
index 83fe53401453f50889c5bdf83f3849239c9c1cce..013e90d691829410cd1b6027f6dbef2980983e23 100644 (file)
@@ -482,7 +482,7 @@ static int epic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev->netdev_ops = &epic_netdev_ops;
        dev->ethtool_ops = &netdev_ethtool_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
-       netif_napi_add(dev, &ep->napi, epic_poll, 64);
+       netif_napi_add(dev, &ep->napi, epic_poll);
 
        ret = register_netdev(dev);
        if (ret < 0)
index 229180aa86de292c1eeae5a5f4dfaea4aba9138f..71fbb358bb7d2bd7395b7ac0dd50d9cb8a250bf9 100644 (file)
@@ -1585,7 +1585,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        dev->netdev_ops = &smsc9420_netdev_ops;
        dev->ethtool_ops = &smsc9420_ethtool_ops;
 
-       netif_napi_add(dev, &pd->napi, smsc9420_rx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &pd->napi, smsc9420_rx_poll);
 
        result = register_netdev(dev);
        if (result) {
index 85e62f5489b66713112791a44645a65ee46ae99e..2240f6d0b89badbeafc4323efce6e2faa19e54ca 100644 (file)
@@ -2093,7 +2093,7 @@ static int netsec_probe(struct platform_device *pdev)
        dev_info(&pdev->dev, "hardware revision %d.%d\n",
                 hw_ver >> 16, hw_ver & 0xffff);
 
-       netif_napi_add(ndev, &priv->napi, netsec_napi_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, netsec_napi_poll);
 
        ndev->netdev_ops = &netsec_netdev_ops;
        ndev->ethtool_ops = &netsec_ethtool_ops;
index ee341a383e6939d31652ac9fe1dde3d9b7702032..1fa09b49ba7fa8bcae6ca2cae26daa710a6ae349 100644 (file)
@@ -1687,8 +1687,7 @@ static int ave_probe(struct platform_device *pdev)
                 pdev->name, pdev->id);
 
        /* Register as a NAPI supported driver */
-       netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx);
        netif_napi_add_tx(ndev, &priv->napi_tx, ave_napi_poll_tx);
 
        platform_set_drvdata(pdev, ndev);
index 8418e795cc21d4c89028dbfb7cd833723f8dc073..5ec3d4537baef4eb1941397c47642fec64699f27 100644 (file)
@@ -6874,8 +6874,7 @@ static void stmmac_napi_add(struct net_device *dev)
                spin_lock_init(&ch->lock);
 
                if (queue < priv->plat->rx_queues_to_use) {
-                       netif_napi_add(dev, &ch->rx_napi, stmmac_napi_poll_rx,
-                                      NAPI_POLL_WEIGHT);
+                       netif_napi_add(dev, &ch->rx_napi, stmmac_napi_poll_rx);
                }
                if (queue < priv->plat->tx_queues_to_use) {
                        netif_napi_add_tx(dev, &ch->tx_napi,
@@ -6884,8 +6883,7 @@ static void stmmac_napi_add(struct net_device *dev)
                if (queue < priv->plat->rx_queues_to_use &&
                    queue < priv->plat->tx_queues_to_use) {
                        netif_napi_add(dev, &ch->rxtx_napi,
-                                      stmmac_napi_poll_rxtx,
-                                      NAPI_POLL_WEIGHT);
+                                      stmmac_napi_poll_rxtx);
                }
        }
 }
index 19a3eb6efc3a5956d96f03c11a2d4de6226ffd52..0aca193d9550d40f43a8536566d417cadb29faa9 100644 (file)
@@ -5050,7 +5050,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev->watchdog_timeo = CAS_TX_TIMEOUT;
 
 #ifdef USE_NAPI
-       netif_napi_add(dev, &cp->napi, cas_poll, 64);
+       netif_napi_add(dev, &cp->napi, cas_poll);
 #endif
        dev->irq = pdev->irq;
        dev->dma = 0;
index bc51a75a0e191bbee05fc94395ab983ee0472754..8addee6d04bd803636c0e14577220332371632c2 100644 (file)
@@ -354,8 +354,7 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 
        dev_set_drvdata(&vdev->dev, port);
 
-       netif_napi_add(dev, &port->napi, sunvnet_poll_common,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &port->napi, sunvnet_poll_common);
 
        spin_lock_irqsave(&vp->lock, flags);
        list_add_rcu(&port->list, &vp->port_list);
index 204a29e72292611a2180ac1d703bc121a518e612..e6144d963eaaadb3343906fac020b38f1734533f 100644 (file)
@@ -9115,7 +9115,7 @@ static int niu_ldg_init(struct niu *np)
        for (i = 0; i < np->num_ldg; i++) {
                struct niu_ldg *lp = &np->ldg[i];
 
-               netif_napi_add(np->dev, &lp->napi, niu_poll, 64);
+               netif_napi_add(np->dev, &lp->napi, niu_poll);
 
                lp->np = np;
                lp->ldg_num = ldg_num_map[i];
index 6fb89c55f95704ae0427333837e25fb4c01c9b8c..4154e68639aced155b9ce1e171b0ed8e7189562d 100644 (file)
@@ -2980,7 +2980,7 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_out_free_consistent;
 
        dev->netdev_ops = &gem_netdev_ops;
-       netif_napi_add(dev, &gp->napi, gem_poll, 64);
+       netif_napi_add(dev, &gp->napi, gem_poll);
        dev->ethtool_ops = &gem_ethtool_ops;
        dev->watchdog_timeo = 5 * HZ;
        dev->dma = 0;
index 042b5022785061606ae8ce0e0d3c2ee98838891c..acda6cbd0238da735bec48f465bf6880a1def7cb 100644 (file)
@@ -467,8 +467,7 @@ static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
        if (err)
                goto err_out_free_port;
 
-       netif_napi_add(port->vp->dev, &port->napi, sunvnet_poll_common,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(port->vp->dev, &port->napi, sunvnet_poll_common);
 
        INIT_HLIST_NODE(&port->hash);
        INIT_LIST_HEAD(&port->list);
index 38e478aa415c62ff0088dad66e4e59fdb20eb6d4..b89d72242002f9c233f48d96686c938df637aae3 100644 (file)
@@ -493,7 +493,7 @@ static int spl2sw_probe(struct platform_device *pdev)
        }
 
        /* Add and enable napi. */
-       netif_napi_add(ndev, &comm->rx_napi, spl2sw_rx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &comm->rx_napi, spl2sw_rx_poll);
        napi_enable(&comm->rx_napi);
        netif_napi_add_tx(ndev, &comm->tx_napi, spl2sw_tx_poll);
        napi_enable(&comm->tx_napi);
index e54ce73396ee7845d7d89f0ca38501ca5936b6b8..36b948820c1e56bc338a6317bf3da5b9010b270a 100644 (file)
@@ -419,15 +419,14 @@ static void xlgmac_napi_enable(struct xlgmac_pdata *pdata, unsigned int add)
                for (i = 0; i < pdata->channel_count; i++, channel++) {
                        if (add)
                                netif_napi_add(pdata->netdev, &channel->napi,
-                                              xlgmac_one_poll,
-                                              NAPI_POLL_WEIGHT);
+                                              xlgmac_one_poll);
 
                        napi_enable(&channel->napi);
                }
        } else {
                if (add)
                        netif_napi_add(pdata->netdev, &pdata->napi,
-                                      xlgmac_all_poll, NAPI_POLL_WEIGHT);
+                                      xlgmac_all_poll);
 
                napi_enable(&pdata->napi);
        }
index 08ba658db98774ea27d812f7d2638eeaf1c406ae..ca409515ead5a43adcfd5bc84bea70bb21cd470d 100644 (file)
@@ -1994,7 +1994,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                priv->nic = nic;
                priv->msg_enable = BDX_DEF_MSG_ENABLE;
 
-               netif_napi_add(ndev, &priv->napi, bdx_poll, 64);
+               netif_napi_add(ndev, &priv->napi, bdx_poll);
 
                if ((readl(nic->regs + FPGA_VER) & 0xFFF) == 308) {
                        DBG("HW statistics not supported\n");
index 4f8f3dda7764b6a1ad94f65cdb7af0d4f2688016..3cbe4ec4623440d6cf914e8cd8ba81375ef56920 100644 (file)
@@ -2044,7 +2044,7 @@ static int am65_cpsw_nuss_init_ndevs(struct am65_cpsw_common *common)
        }
 
        netif_napi_add(common->dma_ndev, &common->napi_rx,
-                      am65_cpsw_nuss_rx_poll, NAPI_POLL_WEIGHT);
+                      am65_cpsw_nuss_rx_poll);
 
        return ret;
 }
index ce92d335927e918d40106f4930ca052dfe346de5..a16be21e382358951a535b24e06e2d7aa58c2509 100644 (file)
@@ -1109,7 +1109,7 @@ static int cpmac_probe(struct platform_device *pdev)
        dev->netdev_ops = &cpmac_netdev_ops;
        dev->ethtool_ops = &cpmac_ethtool_ops;
 
-       netif_napi_add(dev, &priv->napi, cpmac_poll, 64);
+       netif_napi_add(dev, &priv->napi, cpmac_poll);
 
        spin_lock_init(&priv->lock);
        spin_lock_init(&priv->rx_lock);
index 99be1228a4e01a61025d0c9579611bc95e5e24ed..709ca6dd6ecb82255f691ad2eda8a6a160cc8b1c 100644 (file)
@@ -1637,8 +1637,7 @@ static int cpsw_probe(struct platform_device *pdev)
        ndev->netdev_ops = &cpsw_netdev_ops;
        ndev->ethtool_ops = &cpsw_ethtool_ops;
        netif_napi_add(ndev, &cpsw->napi_rx,
-                      cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll,
-                      NAPI_POLL_WEIGHT);
+                      cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll);
        netif_napi_add_tx(ndev, &cpsw->napi_tx,
                          cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll);
 
index 14fd90da32fdd5ccba0a26fc350c5fd9114ee25a..83596ec0c7cb9b0527ebff58f43928b36dbcc01f 100644 (file)
@@ -1416,9 +1416,7 @@ static int cpsw_create_ports(struct cpsw_common *cpsw)
                         * accordingly.
                         */
                        netif_napi_add(ndev, &cpsw->napi_rx,
-                                      cpsw->quirk_irq ?
-                                      cpsw_rx_poll : cpsw_rx_mq_poll,
-                                      NAPI_POLL_WEIGHT);
+                                      cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll);
                        netif_napi_add_tx(ndev, &cpsw->napi_tx,
                                          cpsw->quirk_irq ?
                                          cpsw_tx_poll : cpsw_tx_mq_poll);
index d45b118b732e1f93469ed27169dea4cd88e014e3..2eb9d5a32588a0532bdfa957986584a16172e514 100644 (file)
@@ -1948,7 +1948,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
 
        ndev->netdev_ops = &emac_netdev_ops;
        ndev->ethtool_ops = &ethtool_ops;
-       netif_napi_add(ndev, &priv->napi, emac_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &priv->napi, emac_poll);
 
        pm_runtime_enable(&pdev->dev);
        rc = pm_runtime_resume_and_get(&pdev->dev);
index b15d44261e766a5be5e6cf65ca9d026586747f6a..aba70bef489459b7df22e0c799744c570ca1c77c 100644 (file)
@@ -2095,7 +2095,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_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll);
        netif_napi_add_tx(ndev, &netcp->tx_napi, netcp_tx_poll);
 
        /* Register the network device */
index 6e838e8f79d0608367023f6645996ee7d9eb8ea7..cf8de8a7a8a1eb0ef0c79ebd69daeb6305783ffc 100644 (file)
@@ -1441,7 +1441,7 @@ static void gelic_ether_setup_netdev_ops(struct net_device *netdev,
 {
        netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT;
        /* NAPI */
-       netif_napi_add(netdev, napi, gelic_net_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, napi, gelic_net_poll);
        netdev->ethtool_ops = &gelic_ether_ethtool_ops;
        netdev->netdev_ops = &gelic_netdevice_ops;
 }
index bc4914c758ad25941d3f179ccecbcb143062c364..50d7eacfec5827a141b6a46be9d12b9b34359e64 100644 (file)
@@ -2270,8 +2270,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
        card->aneg_count = 0;
        timer_setup(&card->aneg_timer, spider_net_link_phy, 0);
 
-       netif_napi_add(netdev, &card->napi,
-                      spider_net_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &card->napi, spider_net_poll);
 
        spider_net_setup_netdev_ops(netdev);
 
index c0b26b5cefe4b2bff02d148e92ad662ccce5906f..2cd2afc3fff0370543ebe0e82ee4c14e94e6185d 100644 (file)
@@ -1585,7 +1585,7 @@ tsi108_init_one(struct platform_device *pdev)
        data->phy_type = einfo->phy_type;
        data->irq_num = einfo->irq_num;
        data->id = pdev->id;
-       netif_napi_add(dev, &data->napi, tsi108_poll, 64);
+       netif_napi_add(dev, &data->napi, tsi108_poll);
        dev->netdev_ops = &tsi108_netdev_ops;
        dev->ethtool_ops = &tsi108_ethtool_ops;
 
index 29cde0bec4b1518796f7d98bf46bc55ef87a1acf..0fb15a17b547213c8cbae9088225b4735b885dae 100644 (file)
@@ -965,7 +965,7 @@ static int rhine_init_one_common(struct device *hwdev, u32 quirks,
        dev->ethtool_ops = &netdev_ethtool_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
 
-       netif_napi_add(dev, &rp->napi, rhine_napipoll, 64);
+       netif_napi_add(dev, &rp->napi, rhine_napipoll);
 
        if (rp->quirks & rqRhineI)
                dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
index 5d710ebb96809d07a023828eeffdb76cdb0557e4..a502812ac418a6e26aab5d03a4ead85a0ce38900 100644 (file)
@@ -2846,7 +2846,7 @@ static int velocity_probe(struct device *dev, int irq,
 
        netdev->netdev_ops = &velocity_netdev_ops;
        netdev->ethtool_ops = &velocity_ethtool_ops;
-       netif_napi_add(netdev, &vptr->napi, velocity_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &vptr->napi, velocity_poll);
 
        netdev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
                           NETIF_F_HW_VLAN_CTAG_TX;
index 40581f40716a9f35c61ea5171f69fa0de1ae02b3..d1d772580da98e576d51c91ea0633f283f44d64e 100644 (file)
@@ -1879,8 +1879,8 @@ static int axienet_probe(struct platform_device *pdev)
        u64_stats_init(&lp->rx_stat_sync);
        u64_stats_init(&lp->tx_stat_sync);
 
-       netif_napi_add(ndev, &lp->napi_rx, axienet_rx_poll, NAPI_POLL_WEIGHT);
-       netif_napi_add(ndev, &lp->napi_tx, axienet_tx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &lp->napi_rx, axienet_rx_poll);
+       netif_napi_add(ndev, &lp->napi_tx, axienet_tx_poll);
 
        lp->axi_clk = devm_clk_get_optional(&pdev->dev, "s_axi_lite_clk");
        if (!lp->axi_clk) {
index 2e2fac0e84da8156e7f531f4cd418593a15b4b29..1eff202f6a1fa2dd6590aa7313f70d3ffe65ebda 100644 (file)
@@ -1057,7 +1057,7 @@ static int fjes_sw_init(struct fjes_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
 
-       netif_napi_add(netdev, &adapter->napi, fjes_poll, 64);
+       netif_napi_add(netdev, &adapter->napi, fjes_poll);
 
        return 0;
 }
index 6e42cb03e226abeae15180521d40db3e80c02f7b..f066de0da49254651a89aa79bd3a890f0c6acc40 100644 (file)
@@ -1779,8 +1779,7 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device,
        }
 
        /* Enable NAPI handler before init callbacks */
-       netif_napi_add(ndev, &net_device->chan_table[0].napi,
-                      netvsc_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(ndev, &net_device->chan_table[0].napi, netvsc_poll);
 
        /* Open the channel */
        device->channel->next_request_id_callback = vmbus_next_request_id;
index 6da36cb8af8055eba338490b6bc7493181e8644c..11f767a20444328875cf5991eb4657553fb37dc9 100644 (file)
@@ -1575,7 +1575,7 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
 
        for (i = 1; i < net_device->num_chn; i++)
                netif_napi_add(net, &net_device->chan_table[i].napi,
-                              netvsc_poll, NAPI_POLL_WEIGHT);
+                              netvsc_poll);
 
        return net_device;
 
index 3f97653450bb92b481e10f28815d7ec548a13486..f8036ee78647f15988218ae54d7c5da16671d26b 100644 (file)
@@ -1607,7 +1607,7 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id)
                                  gsi_channel_poll);
        else
                netif_napi_add(&gsi->dummy_dev, &channel->napi,
-                              gsi_channel_poll, NAPI_POLL_WEIGHT);
+                              gsi_channel_poll);
 
        return 0;
 
index c058eabd7b3661d326b0d588f8c44023024c7ec5..83fcaeb2ac5e81d0e9b1e80b3667e355b1ec7bf9 100644 (file)
@@ -1282,7 +1282,7 @@ static int tbnet_probe(struct tb_service *svc, const struct tb_service_id *id)
        dev->features = dev->hw_features | NETIF_F_HIGHDMA;
        dev->hard_header_len += sizeof(struct thunderbolt_ip_frame_header);
 
-       netif_napi_add(dev, &net->napi, tbnet_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(dev, &net->napi, tbnet_poll);
 
        /* MTU range: 68 - 65522 */
        dev->min_mtu = ETH_MIN_MTU;
index 3226ab33afae5d5f93961a233f0b40b30dd84cf1..f18ab8e220db72787bffef62c598e7c65e1e1c6e 100644 (file)
@@ -4374,7 +4374,7 @@ static int lan78xx_probe(struct usb_interface *intf,
 
        netif_set_tso_max_size(netdev, LAN78XX_TSO_SIZE(dev));
 
-       netif_napi_add(netdev, &dev->napi, lan78xx_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(netdev, &dev->napi, lan78xx_poll);
 
        INIT_DELAYED_WORK(&dev->wq, lan78xx_delayedwork);
        init_usb_anchor(&dev->deferred);
index 550c85a366a0eb8bbfedc4813d44daa73f0a4398..09682ea3354e92b05c2f42a1a37da7cc060c89a7 100644 (file)
@@ -1070,7 +1070,7 @@ static int veth_enable_xdp_range(struct net_device *dev, int start, int end,
                struct veth_rq *rq = &priv->rq[i];
 
                if (!napi_already_on)
-                       netif_napi_add(dev, &rq->xdp_napi, veth_poll, NAPI_POLL_WEIGHT);
+                       netif_napi_add(dev, &rq->xdp_napi, veth_poll);
                err = xdp_rxq_info_reg(&rq->xdp_rxq, dev, i, rq->xdp_napi.napi_id);
                if (err < 0)
                        goto err_rxq_reg;
@@ -1184,7 +1184,7 @@ static int veth_napi_enable_range(struct net_device *dev, int start, int end)
        for (i = start; i < end; i++) {
                struct veth_rq *rq = &priv->rq[i];
 
-               netif_napi_add(dev, &rq->xdp_napi, veth_poll, NAPI_POLL_WEIGHT);
+               netif_napi_add(dev, &rq->xdp_napi, veth_poll);
        }
 
        err = __veth_napi_enable_range(dev, start, end);
index 53b3b241e027817c7859b414fe944bf97fcba35f..d3e7b27eb9332ae4e5f856f9eee10ca4d790c859 100644 (file)
@@ -3882,11 +3882,11 @@ vmxnet3_probe_device(struct pci_dev *pdev,
                for (i = 0; i < adapter->num_rx_queues; i++) {
                        netif_napi_add(adapter->netdev,
                                       &adapter->rx_queue[i].napi,
-                                      vmxnet3_poll_rx_only, 64);
+                                      vmxnet3_poll_rx_only);
                }
        } else {
                netif_napi_add(adapter->netdev, &adapter->rx_queue[0].napi,
-                              vmxnet3_poll, 64);
+                              vmxnet3_poll);
        }
 
        netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
index 1acd00ab2fbcbf0ac5faabae474bf6ec16dcf30c..1cb502a932e07c16ecf91121a294ccafc7005516 100644 (file)
@@ -54,8 +54,7 @@ struct wg_peer *wg_peer_create(struct wg_device *wg,
        skb_queue_head_init(&peer->staged_packet_queue);
        wg_noise_reset_last_sent_handshake(&peer->last_sent_handshake);
        set_bit(NAPI_STATE_NO_BUSY_POLL, &peer->napi.state);
-       netif_napi_add(wg->dev, &peer->napi, wg_packet_rx_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(wg->dev, &peer->napi, wg_packet_rx_poll);
        napi_enable(&peer->napi);
        list_add_tail(&peer->peer_list, &wg->peer_list);
        INIT_LIST_HEAD(&peer->allowedips_list);
index bf1c938be7d0a2889d8181c8219142ce0d5e0232..a77cb79a7a54c1892a80180df6a93836e81f6542 100644 (file)
@@ -3215,8 +3215,7 @@ static void ath10k_pci_free_irq(struct ath10k *ar)
 
 void ath10k_pci_init_napi(struct ath10k *ar)
 {
-       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll);
 }
 
 static int ath10k_pci_init_irq(struct ath10k *ar)
index 24283c02a5ef6abc21b45b1313727bafe78cf0ab..e0e98f9f127e03eac584611501715aec2e8a6373 100644 (file)
@@ -2531,8 +2531,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,
                return -ENOMEM;
        }
 
-       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll);
 
        ath10k_dbg(ar, ATH10K_DBG_BOOT,
                   "sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",
index 5576ad9fd11610c72a9edc7309c63c6dc9e1477a..cfcb759a87deac499b6b15b208aeb16cfa934271 100644 (file)
@@ -1242,8 +1242,7 @@ static int ath10k_snoc_napi_poll(struct napi_struct *ctx, int budget)
 
 static void ath10k_snoc_init_napi(struct ath10k *ar)
 {
-       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll);
 }
 
 static int ath10k_snoc_request_irq(struct ath10k *ar)
index ad6471b217964b2a9a5c1da457deda059a95f4c0..b0067af685b1683d71820151d84093360456bc58 100644 (file)
@@ -1014,8 +1014,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,
                return -ENOMEM;
        }
 
-       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_usb_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_usb_napi_poll);
 
        usb_get_dev(dev);
        vendor_id = le16_to_cpu(dev->descriptor.idVendor);
index c4741471013822f5f870f1ed407f1c74b9117ab1..1be4a25947a34f47ff9d8b842dfa11f5de9d273b 100644 (file)
@@ -541,7 +541,7 @@ static int ath11k_ahb_config_ext_irq(struct ath11k_base *ab)
                irq_grp->grp_id = i;
                init_dummy_netdev(&irq_grp->napi_ndev);
                netif_napi_add(&irq_grp->napi_ndev, &irq_grp->napi,
-                              ath11k_ahb_ext_grp_napi_poll, NAPI_POLL_WEIGHT);
+                              ath11k_ahb_ext_grp_napi_poll);
 
                for (j = 0; j < ATH11K_EXT_IRQ_NUM_MAX; j++) {
                        if (ab->hw_params.ring_mask->tx[i] & BIT(j)) {
index 1adf20ebef27ce8f58fc8a50588199f5ab6ae8cf..825cd884e6cda63692bc8e61b2a2b7edd7fb3d39 100644 (file)
@@ -517,7 +517,7 @@ static int ath11k_pcic_ext_irq_config(struct ath11k_base *ab)
                irq_grp->grp_id = i;
                init_dummy_netdev(&irq_grp->napi_ndev);
                netif_napi_add(&irq_grp->napi_ndev, &irq_grp->napi,
-                              ath11k_pcic_ext_grp_napi_poll, NAPI_POLL_WEIGHT);
+                              ath11k_pcic_ext_grp_napi_poll);
 
                if (ab->hw_params.ring_mask->tx[i] ||
                    ab->hw_params.ring_mask->rx[i] ||
index e76b38ad1d44d2371b676638f1cf455e6e4b96f8..ee7d7e9c27184b425956bb8f148ea72e6a2d5c54 100644 (file)
@@ -456,14 +456,12 @@ int wil_if_add(struct wil6210_priv *wil)
        init_dummy_netdev(&wil->napi_ndev);
        if (wil->use_enhanced_dma_hw) {
                netif_napi_add(&wil->napi_ndev, &wil->napi_rx,
-                              wil6210_netdev_poll_rx_edma,
-                              NAPI_POLL_WEIGHT);
+                              wil6210_netdev_poll_rx_edma);
                netif_napi_add_tx(&wil->napi_ndev,
                                  &wil->napi_tx, wil6210_netdev_poll_tx_edma);
        } else {
                netif_napi_add(&wil->napi_ndev, &wil->napi_rx,
-                              wil6210_netdev_poll_rx,
-                              NAPI_POLL_WEIGHT);
+                              wil6210_netdev_poll_rx);
                netif_napi_add_tx(&wil->napi_ndev,
                                  &wil->napi_tx, wil6210_netdev_poll_tx);
        }
index 68a4572cee5346ba097c56b22084c83b0b19e9c1..9c9f87fe8377701c9e7eb5bb9de9620153cdf1b3 100644 (file)
@@ -1110,7 +1110,7 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)
                                poll = iwl_pcie_napi_poll_msix;
 
                        netif_napi_add(&trans_pcie->napi_dev, &rxq->napi,
-                                      poll, NAPI_POLL_WEIGHT);
+                                      poll);
                        napi_enable(&rxq->napi);
                }
 
index 40cb91097b2e73a2f30dcfffaeb54c95fcb16e25..4901aa02b4fb11ca828654bf95ed7173b88a91b9 100644 (file)
@@ -758,7 +758,7 @@ mt76_dma_init(struct mt76_dev *dev,
        dev->napi_dev.threaded = 1;
 
        mt76_for_each_q_rx(dev, i) {
-               netif_napi_add(&dev->napi_dev, &dev->napi[i], poll, 64);
+               netif_napi_add(&dev->napi_dev, &dev->napi[i], poll);
                mt76_dma_rx_fill(dev, &dev->q_rx[i]);
                napi_enable(&dev->napi[i]);
        }
index 7abb1e22b7083052619fe55daf60da7608d5a1ca..0975d27240e4667ca3796d3d2b964457a943d3bc 100644 (file)
@@ -1717,8 +1717,7 @@ static void rtw_pci_napi_init(struct rtw_dev *rtwdev)
        struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;
 
        init_dummy_netdev(&rtwpci->netdev);
-       netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll,
-                      NAPI_POLL_WEIGHT);
+       netif_napi_add(&rtwpci->netdev, &rtwpci->napi, rtw_pci_napi_poll);
 }
 
 static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev)
index 71ee237a7c286f141893920719dfeb9fd26eb38f..17133d97cd325211e16cda6620de69fbe82ac9af 100644 (file)
@@ -1786,7 +1786,7 @@ void rtw89_core_napi_init(struct rtw89_dev *rtwdev)
 {
        init_dummy_netdev(&rtwdev->netdev);
        netif_napi_add(&rtwdev->netdev, &rtwdev->napi,
-                      rtwdev->hci.ops->napi_poll, NAPI_POLL_WEIGHT);
+                      rtwdev->hci.ops->napi_poll);
 }
 EXPORT_SYMBOL(rtw89_core_napi_init);
 
index e579ecd40b7400fd2eef2da473f6202a1243ca1d..650fa180220fd6d1fb75f529a19680c7aab0173d 100644 (file)
@@ -723,8 +723,7 @@ int xenvif_connect_data(struct xenvif_queue *queue,
        init_waitqueue_head(&queue->dealloc_wq);
        atomic_set(&queue->inflight_packets, 0);
 
-       netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
-                       NAPI_POLL_WEIGHT);
+       netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll);
 
        queue->stalled = true;
 
index 2cb7e741e1a2460defc8f5833828cb23661f9ce1..9af2b027c19c6899c6b5a3efc8f2d3a54f92d71f 100644 (file)
@@ -2224,8 +2224,7 @@ static int xennet_create_queues(struct netfront_info *info,
                        return ret;
                }
 
-               netif_napi_add(queue->info->netdev, &queue->napi,
-                              xennet_poll, 64);
+               netif_napi_add(queue->info->netdev, &queue->napi, xennet_poll);
                if (netif_running(info->netdev))
                        napi_enable(&queue->napi);
        }
index 0ce635b7b472d4e01820f2bf938f0f11da371284..9dc935886e9f367984d68ed102195f441ceab2e6 100644 (file)
@@ -1133,7 +1133,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
                                       PAGE_SIZE * (QDIO_MAX_ELEMENTS_PER_BUFFER - 1));
        }
 
-       netif_napi_add(card->dev, &card->napi, qeth_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(card->dev, &card->napi, qeth_poll);
        return register_netdev(card->dev);
 }
 
index 8d44bce0477abd2802a81e6e6042851c5b4aa0cf..d8487a10cd5557fca98fe2859bba23696159212e 100644 (file)
@@ -1910,7 +1910,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
                netif_set_tso_max_size(card->dev,
                                       PAGE_SIZE * (QETH_MAX_BUFFER_ELEMENTS(card) - 1));
 
-       netif_napi_add(card->dev, &card->napi, qeth_poll, NAPI_POLL_WEIGHT);
+       netif_napi_add(card->dev, &card->napi, qeth_poll);
        return register_netdev(card->dev);
 }
 
index ca6b966f5dd3d021aa274cdad9f11786225cd103..1ead7793062a66e5b3d4525fb1d012d38d498001 100644 (file)
@@ -3041,8 +3041,8 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
                /* Inbound completion handling rx_rings run in
                 * separate NAPI contexts.
                 */
-               netif_napi_add_weight(qdev->ndev, &rx_ring->napi,
-                                     qlge_napi_poll_msix, 64);
+               netif_napi_add(qdev->ndev, &rx_ring->napi,
+                              qlge_napi_poll_msix);
                cqicb->irq_delay = cpu_to_le16(qdev->rx_coalesce_usecs);
                cqicb->pkt_delay = cpu_to_le16(qdev->rx_max_coalesced_frames);
        } else {
index 9f42fc871c3b8d1fd858b498a58a2df152b3fec4..7a084a1c14e98e95cb29c2ad62ea8047d17d8b5a 100644 (file)
@@ -2553,16 +2553,15 @@ void netif_napi_add_weight(struct net_device *dev, struct napi_struct *napi,
  * @dev:  network device
  * @napi: NAPI context
  * @poll: polling function
- * @weight: default weight
  *
  * netif_napi_add() must be used to initialize a NAPI context prior to calling
  * *any* of the other NAPI-related functions.
  */
 static inline void
 netif_napi_add(struct net_device *dev, struct napi_struct *napi,
-              int (*poll)(struct napi_struct *, int), int weight)
+              int (*poll)(struct napi_struct *, int))
 {
-       netif_napi_add_weight(dev, napi, poll, weight);
+       netif_napi_add_weight(dev, napi, poll, NAPI_POLL_WEIGHT);
 }
 
 static inline void
index 21619c70a82b78aa82bcf63db22e6403ca2b22bd..ed5ec5de47f670753924bd0c72db1e3ceb9b9e7a 100644 (file)
@@ -81,8 +81,7 @@ int gro_cells_init(struct gro_cells *gcells, struct net_device *dev)
 
                set_bit(NAPI_STATE_NO_BUSY_POLL, &cell->napi.state);
 
-               netif_napi_add(dev, &cell->napi, gro_cell_poll,
-                              NAPI_POLL_WEIGHT);
+               netif_napi_add(dev, &cell->napi, gro_cell_poll);
                napi_enable(&cell->napi);
        }
        return 0;