[PATCH net-next 2/2] net: move snowflake callers to netif_napi_add_tx_weight()
From: Jakub Kicinski <kuba@kernel.org>
Date: 2022-05-04 16:37:53
Subsystem:
freescale etsec ethernet driver (gianfar), microchip lan743x ethernet driver, networking drivers, the rest, virtio net driver · Maintainers:
Claudiu Manoil, Bryan Whitehead, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, "Michael S. Tsirkin", Jason Wang
Make the drivers with custom tx napi weight call netif_napi_add_tx_weight(). Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: claudiu.manoil@nxp.com CC: bryan.whitehead@microchip.com CC: UNGLinuxDriver@microchip.com CC: mst@redhat.com CC: jasowang@redhat.com CC: virtualization@lists.linux-foundation.org --- 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(-)
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index f0b652a65043..3dc9369a33f7 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c@@ -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) {
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 9ac0c2b96a15..efbddf24ba31 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c@@ -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;
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index cbba9d2e8f32..ebb98b796352 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c@@ -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);
--
2.34.1