net: switch to netif_napi_add_tx()
Subsystems (27)
Jakub Kicinski
maintainerPATCH 1/2 net: switch to netif_napi_add_tx()
Switch net callers to the new API not requiring
the NAPI_POLL_WEIGHT argument.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +-- drivers/net/ethernet/fungible/funeth/funeth_main.c | 3 +-- drivers/net/ethernet/lantiq_xrx200.c | 4 ++-- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 +-- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 9 ++++----- drivers/net/ethernet/rocker/rocker_main.c | 3 +-- drivers/net/ethernet/socionext/sni_ave.c | 3 +-- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 ++-- drivers/net/ethernet/ti/cpsw.c | 5 ++--- drivers/net/ethernet/ti/cpsw_new.c | 5 ++--- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ipa/gsi.c | 4 ++-- drivers/net/tun.c | 3 +-- drivers/s390/net/qeth_core_main.c | 3 +-- net/mptcp/protocol.c | 4 ++-- 19 files changed, 29 insertions(+), 40 deletions(-)
drivers/net/ethernet/broadcom/bcm4908_enet.c +1 -1
@@ -722,7 +722,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev) netdev->min_mtu =ETH_ZLEN ; netdev->mtu =ETH_DATA_LEN ; netdev->max_mtu =ENET_MTU_MAX ; -netif_tx_napi_add (netdev, &enet->tx_ring.napi, bcm4908_enet_poll_tx,NAPI_POLL_WEIGHT ); +netif_napi_add_tx (netdev, &enet->tx_ring.napi, bcm4908_enet_poll_tx);netif_napi_add (netdev, &enet->rx_ring.napi, bcm4908_enet_poll_rx,NAPI_POLL_WEIGHT ); err =register_netdev (netdev);
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -1517,7 +1517,7 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,/* Initialize SW view of the ring */ spin_lock_init (&ring->lock); ring->priv = priv; -netif_tx_napi_add (priv->netdev, &ring->napi, bcm_sysport_tx_poll,64 ); +netif_napi_add_tx (priv->netdev, &ring->napi, bcm_sysport_tx_poll); ring->index = index; ring->size = size; ring->clean_index =0 ;
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -2
@@ -2671,8 +2671,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, DMA_END_ADDR);/* Initialize Tx NAPI */ -netif_tx_napi_add (priv->dev, &ring->napi, bcmgenet_tx_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (priv->dev, &ring->napi, bcmgenet_tx_poll); }/* Initialize a RDMA ring */
drivers/net/ethernet/fungible/funeth/funeth_main.c +1 -2
@@ -330,8 +330,7 @@ static int fun_alloc_queue_irqs(struct net_device *dev, unsigned int ntx,return PTR_ERR (irq); fp->num_tx_irqs++; -netif_tx_napi_add (dev, &irq->napi, fun_txq_napi_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (dev, &irq->napi, fun_txq_napi_poll); }for (i = fp->num_rx_irqs; i < nrx; i++) {
drivers/net/ethernet/lantiq_xrx200.c +2 -2
@@ -615,8 +615,8 @@ static int xrx200_probe(struct platform_device *pdev)/* setup NAPI */ netif_napi_add (net_dev, &priv->chan_rx.napi, xrx200_poll_rx,NAPI_POLL_WEIGHT ); -netif_tx_napi_add (net_dev, &priv->chan_tx.napi, xrx200_tx_housekeeping, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (net_dev, &priv->chan_tx.napi, + xrx200_tx_housekeeping);platform_set_drvdata (pdev, priv);
drivers/net/ethernet/mellanox/mlx4/en_cq.c +1 -2
@@ -147,8 +147,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,switch (cq->type) {case TX : cq->mcq.comp = mlx4_en_tx_irq; -netif_tx_napi_add (cq->dev, &cq->napi, mlx4_en_poll_tx_cq, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (cq->dev, &cq->napi, mlx4_en_poll_tx_cq);napi_enable (&cq->napi);break ;case RX :
drivers/net/ethernet/microsoft/mana/mana_en.c +1 -1
@@ -1371,7 +1371,7 @@ static int mana_create_txq(struct mana_port_context *apc, gc->cq_table[cq->gdma_id] = cq->gdma_cq; -netif_tx_napi_add (net, &cq->napi, mana_poll,NAPI_POLL_WEIGHT ); +netif_napi_add_tx (net, &cq->napi, mana_poll);napi_enable (&cq->napi);mana_gd_ring_cq (cq->gdma_cq,SET_ARM_BIT );
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +4 -5
@@ -1608,8 +1608,8 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,if (qlcnic_check_multi_tx (adapter) && !adapter->ahw->diag_test) {for (ring =0 ; ring < adapter->drv_tx_rings; ring++) { tx_ring = &adapter->tx_ring[ring]; -netif_tx_napi_add (netdev, &tx_ring->napi, qlcnic_tx_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (netdev, &tx_ring->napi, + qlcnic_tx_poll); } }
@@ -2138,9 +2138,8 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter, !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {for (ring =0 ; ring < adapter->drv_tx_rings; ring++) { tx_ring = &adapter->tx_ring[ring]; -netif_tx_napi_add (netdev, &tx_ring->napi, - qlcnic_83xx_msix_tx_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (netdev, &tx_ring->napi, + qlcnic_83xx_msix_tx_poll); } }
drivers/net/ethernet/rocker/rocker_main.c +1 -2
@@ -2573,8 +2573,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)rocker_port_dev_addr_init (rocker_port); dev->netdev_ops = &rocker_port_netdev_ops; dev->ethtool_ops = &rocker_port_ethtool_ops; -netif_tx_napi_add (dev, &rocker_port->napi_tx, rocker_port_poll_tx, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (dev, &rocker_port->napi_tx, rocker_port_poll_tx);netif_napi_add (dev, &rocker_port->napi_rx, rocker_port_poll_rx,NAPI_POLL_WEIGHT );rocker_carrier_init (rocker_port);
drivers/net/ethernet/socionext/sni_ave.c +1 -2
@@ -1689,8 +1689,7 @@ static int ave_probe(struct platform_device *pdev)/* Register as a NAPI supported driver */ netif_napi_add (ndev, &priv->napi_rx, ave_napi_poll_rx,NAPI_POLL_WEIGHT ); -netif_tx_napi_add (ndev, &priv->napi_tx, ave_napi_poll_tx, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (ndev, &priv->napi_tx, ave_napi_poll_tx);platform_set_drvdata (pdev, ndev);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -3
@@ -6759,9 +6759,8 @@ static void stmmac_napi_add(struct net_device *dev) NAPI_POLL_WEIGHT); }if (queue < priv->plat->tx_queues_to_use) { -netif_tx_napi_add (dev, &ch->tx_napi, - stmmac_napi_poll_tx, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (dev, &ch->tx_napi, + stmmac_napi_poll_tx); }if (queue < priv->plat->rx_queues_to_use && queue < priv->plat->tx_queues_to_use) {
drivers/net/ethernet/ti/am65-cpsw-nuss.c +2 -2
@@ -2032,8 +2032,8 @@ static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common)for (i =0 ; i < common->tx_ch_num; i++) {struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i]; -netif_tx_napi_add (common->dma_ndev, &tx_chn->napi_tx, - am65_cpsw_nuss_tx_poll,NAPI_POLL_WEIGHT ); +netif_napi_add_tx (common->dma_ndev, &tx_chn->napi_tx, + am65_cpsw_nuss_tx_poll); ret = devm_request_irq(dev, tx_chn->irq, am65_cpsw_nuss_tx_irq,
drivers/net/ethernet/ti/cpsw.c +2 -3
@@ -1640,9 +1640,8 @@ static int cpsw_probe(struct platform_device *pdev)netif_napi_add (ndev, &cpsw->napi_rx, cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll,NAPI_POLL_WEIGHT ); -netif_tx_napi_add (ndev, &cpsw->napi_tx, - cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (ndev, &cpsw->napi_tx, + cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll);/* register the network device */ SET_NETDEV_DEV (ndev, dev);
drivers/net/ethernet/ti/cpsw_new.c +2 -3
@@ -1417,10 +1417,9 @@ static int cpsw_create_ports(struct cpsw_common *cpsw) cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll, NAPI_POLL_WEIGHT); -netif_tx_napi_add (ndev, &cpsw->napi_tx, +netif_napi_add_tx (ndev, &cpsw->napi_tx, cpsw->quirk_irq ? - cpsw_tx_poll : cpsw_tx_mq_poll, -NAPI_POLL_WEIGHT ); + cpsw_tx_poll : cpsw_tx_mq_poll); } napi_ndev = ndev;
drivers/net/ethernet/ti/netcp_core.c +1 -1
@@ -2096,7 +2096,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,/* NAPI register */ netif_napi_add (ndev, &netcp->rx_napi, netcp_rx_poll,NAPI_POLL_WEIGHT ); -netif_tx_napi_add (ndev, &netcp->tx_napi, netcp_tx_poll,NAPI_POLL_WEIGHT ); +netif_napi_add_tx (ndev, &netcp->tx_napi, netcp_tx_poll);/* Register the network device */ ndev->dev_id =0 ;
drivers/net/ipa/gsi.c +2 -2
@@ -1614,8 +1614,8 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id)gsi_channel_program (channel, true);if (channel->toward_ipa) -netif_tx_napi_add (&gsi->dummy_dev, &channel->napi, - gsi_channel_poll,NAPI_POLL_WEIGHT ); +netif_napi_add_tx (&gsi->dummy_dev, &channel->napi, + gsi_channel_poll);else netif_napi_add (&gsi->dummy_dev, &channel->napi, gsi_channel_poll,NAPI_POLL_WEIGHT );
drivers/net/tun.c +1 -2
@@ -268,8 +268,7 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile, tfile->napi_enabled = napi_en; tfile->napi_frags_enabled = napi_en && napi_frags;if (napi_en) { -netif_tx_napi_add (tun->dev, &tfile->napi, tun_napi_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (tun->dev, &tfile->napi, tun_napi_poll);napi_enable (&tfile->napi); } }
drivers/s390/net/qeth_core_main.c +1 -2
@@ -7099,8 +7099,7 @@ int qeth_open(struct net_device *dev)local_bh_disable ();qeth_for_each_output_queue (card, queue, i) { -netif_tx_napi_add (dev, &queue->napi, qeth_tx_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (dev, &queue->napi, qeth_tx_poll);napi_enable (&queue->napi);napi_schedule (&queue->napi); }
net/mptcp/protocol.c +2 -2
@@ -3786,8 +3786,8 @@ void __init mptcp_proto_init(void)for_each_possible_cpu (cpu) { delegated =per_cpu_ptr (&mptcp_delegated_actions, cpu);INIT_LIST_HEAD (&delegated->head); -netif_tx_napi_add (&mptcp_napi_dev, &delegated->napi, mptcp_napi_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (&mptcp_napi_dev, &delegated->napi, + mptcp_napi_poll);napi_enable (&delegated->napi); }
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH 2/2 net: move snowflake callers to netif_napi_add_tx_weight()
Make the drivers with custom tx napi weight call netif_napi_add_tx_weight().
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/freescale/gianfar.c | 4 ++-- drivers/net/ethernet/microchip/lan743x_main.c | 6 +++--- drivers/net/virtio_net.c | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +2 -2
@@ -3233,8 +3233,8 @@ static int gfar_probe(struct platform_device *ofdev)for (i =0 ; i < priv->num_grps; i++) {netif_napi_add (dev, &priv->gfargrp[i].napi_rx, gfar_poll_rx_sq,NAPI_POLL_WEIGHT ); -netif_tx_napi_add (dev, &priv->gfargrp[i].napi_tx, - gfar_poll_tx_sq,2 ); +netif_napi_add_tx_weight (dev, &priv->gfargrp[i].napi_tx, + gfar_poll_tx_sq,2 ); }if (priv->device_flags &FSL_GIANFAR_DEV_HAS_CSUM ) {
drivers/net/ethernet/microchip/lan743x_main.c +3 -3
@@ -2044,9 +2044,9 @@ static int lan743x_tx_open(struct lan743x_tx *tx) tx->vector_flags =lan743x_intr_get_vector_flags (adapter,INT_BIT_DMA_TX_ (tx->channel_number)); -netif_tx_napi_add (adapter->netdev, - &tx->napi, lan743x_tx_napi_poll, - tx->ring_size -1 ); +netif_napi_add_tx_weight (adapter->netdev, + &tx->napi, lan743x_tx_napi_poll, + tx->ring_size -1 );napi_enable (&tx->napi); data =0 ;
drivers/net/virtio_net.c +3 -2
@@ -3315,8 +3315,9 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) vi->rq[i].pages =NULL ;netif_napi_add (vi->dev, &vi->rq[i].napi, virtnet_poll, napi_weight); -netif_tx_napi_add (vi->dev, &vi->sq[i].napi, virtnet_poll_tx, - napi_tx ? napi_weight :0 ); +netif_napi_add_tx_weight (vi->dev, &vi->sq[i].napi, + virtnet_poll_tx, + napi_tx ? napi_weight :0 );sg_init_table (vi->rq[i].sg,ARRAY_SIZE (vi->rq[i].sg));ewma_pkt_len_init (&vi->rq[i].mrg_avg_pkt_len);
Signature · 1 line
2.34.1
Quoted 36 lines · Jakub Kicinski
Switch net callers to the new API not requiring
theNAPI_POLL_WEIGHTargument.Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
Quoted 4 lines
--- drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +--
For the above:
Signature · 1 line
Florian
Quoted 45 lines · Jakub Kicinski
Switch net callers to the new API not requiring
theNAPI_POLL_WEIGHTargument.Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]--- drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +-- drivers/net/ethernet/fungible/funeth/funeth_main.c | 3 +-- drivers/net/ethernet/lantiq_xrx200.c | 4 ++-- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 +-- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 9 ++++-----
Quoted 8 lines
drivers/net/ethernet/rocker/rocker_main.c | 3 +-- drivers/net/ethernet/socionext/sni_ave.c | 3 +-- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 ++-- drivers/net/ethernet/ti/cpsw.c | 5 ++--- drivers/net/ethernet/ti/cpsw_new.c | 5 ++--- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ipa/gsi.c | 4 ++--
For drivers/net/ipa/gsi.c:
Quoted 5 lines
drivers/net/tun.c | 3 +-- drivers/s390/net/qeth_core_main.c | 3 +-- net/mptcp/protocol.c | 4 ++-- 19 files changed, 29 insertions(+), 40 deletions(-)
. . .
Quoted 5 lines
drivers/net/ipa/gsi.c +0
-0
drivers/net/ipa/gsi.c static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id) · line 1621
Quoted 10 lines
drivers/net/ipa/gsi.c +2
-2@@ -1614,8 +1614,8 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id)gsi_channel_program (channel, true);if (channel->toward_ipa) -netif_tx_napi_add (&gsi->dummy_dev, &channel->napi, - gsi_channel_poll,NAPI_POLL_WEIGHT ); +netif_napi_add_tx (&gsi->dummy_dev, &channel->napi, + gsi_channel_poll);else netif_napi_add (&gsi->dummy_dev, &channel->napi, gsi_channel_poll,NAPI_POLL_WEIGHT );
. . .
Quoted 5 lines · Jakub Kicinski
Switch net callers to the new API not requiring
theNAPI_POLL_WEIGHTargument.Signed-off-by Jakub Kicinski <[email protected]>---
...
Quoted 3 lines
net/mptcp/protocol.c| 4 ++--19 files changed, 29 insertions(+), 40 deletions(-)
For the MPTCP content:
Quoted 19 lines
net/mptcp/protocol.c +2
-2@@ -3786,8 +3786,8 @@ void __init mptcp_proto_init(void)for_each_possible_cpu (cpu) { delegated =per_cpu_ptr (&mptcp_delegated_actions, cpu);INIT_LIST_HEAD (&delegated->head); -netif_tx_napi_add (&mptcp_napi_dev, &delegated->napi, mptcp_napi_poll, -NAPI_POLL_WEIGHT ); +netif_napi_add_tx (&mptcp_napi_dev, &delegated->napi, + mptcp_napi_poll);napi_enable (&delegated->napi); }Signature · 1 line
2.34.1
--
Mat Martineau
Intel
Re: [PATCH net-next 2/2] net: move snowflake callers to netif_napi_add_tx_weight()
In reply to Jakub KicinskiQuoted 53 lines · Jakub Kicinski
Make the drivers with custom tx napi weight call
netif_napi_add_tx_weight().Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]--- drivers/net/ethernet/freescale/gianfar.c | 4 ++-- drivers/net/ethernet/microchip/lan743x_main.c | 6 +++--- drivers/net/virtio_net.c | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-)drivers/net/ethernet/freescale/gianfar.c +2
-2@@ -3233,8 +3233,8 @@ static int gfar_probe(struct platform_device *ofdev)for (i =0 ; i < priv->num_grps; i++) {netif_napi_add (dev, &priv->gfargrp[i].napi_rx, gfar_poll_rx_sq,NAPI_POLL_WEIGHT ); -netif_tx_napi_add (dev, &priv->gfargrp[i].napi_tx, - gfar_poll_tx_sq,2 ); +netif_napi_add_tx_weight (dev, &priv->gfargrp[i].napi_tx, + gfar_poll_tx_sq,2 ); }if (priv->device_flags &FSL_GIANFAR_DEV_HAS_CSUM ) {drivers/net/ethernet/microchip/lan743x_main.c +3
-3@@ -2044,9 +2044,9 @@ static int lan743x_tx_open(struct lan743x_tx *tx) tx->vector_flags =lan743x_intr_get_vector_flags (adapter,INT_BIT_DMA_TX_ (tx->channel_number)); -netif_tx_napi_add (adapter->netdev, - &tx->napi, lan743x_tx_napi_poll, - tx->ring_size -1 ); +netif_napi_add_tx_weight (adapter->netdev, + &tx->napi, lan743x_tx_napi_poll, + tx->ring_size -1 );napi_enable (&tx->napi); data =0 ;drivers/net/virtio_net.c +0
-0
drivers/net/virtio_net.c static int virtnet_alloc_queues(struct virtnet_info *vi) · line 3320
Quoted 8 lines
drivers/net/virtio_net.c +3
-2@@ -3315,8 +3315,9 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) vi->rq[i].pages =NULL ;netif_napi_add (vi->dev, &vi->rq[i].napi, virtnet_poll, napi_weight); -netif_tx_napi_add (vi->dev, &vi->sq[i].napi, virtnet_poll_tx, - napi_tx ? napi_weight :0 ); +netif_napi_add_tx_weight (vi->dev, &vi->sq[i].napi, + virtnet_poll_tx, + napi_tx ? napi_weight :0 );
for virtio-net:
Quoted 6 lines
drivers/net/virtio_net.c +0
-1sg_init_table (vi->rq[i].sg,ARRAY_SIZE (vi->rq[i].sg));ewma_pkt_len_init (&vi->rq[i].mrg_avg_pkt_len); --2.34.1
Quoted 37 lines · Jakub Kicinski
Switch net callers to the new API not requiring
theNAPI_POLL_WEIGHTargument.Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
---
...
Quoted 1 line
drivers/s390/net/qeth_core_main.c | 3 +--
For drivers/s390/net/qeth_core_main.c :
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 37 lines · On Wed, 4 May 2022 09:37:24 -0700 you wrote:
Switch net callers to the new API not requiring
theNAPI_POLL_WEIGHTargument.Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,1/2] net: switch to netif_napi_add_tx()
https://git.kernel.org/netdev/net-next/c/16d083e28f1a - [net-next,2/2] net: move snowflake callers to netif_napi_add_tx_weight() https://git.kernel.org/netdev/net-next/c/8d602e1a132e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html