Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d64b5e85 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: add netif_tx_napi_add() 



netif_tx_napi_add() is a variant of netif_napi_add()

It should be used by drivers that use a napi structure
to exclusively poll TX.

We do not want to add this kind of napi in napi_hash[] in following
patches, adding generic busy polling to all NAPI drivers.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93f93a44

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −1
Original line number Diff line number Diff line
@@ -1216,7 +1216,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_napi_add(priv->netdev, &ring->napi, bcm_sysport_tx_poll, 64);

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

	ring->index = index;

	ring->size = size;

	ring->alloc_size = ring->size;

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

+2 −2
Original line number Diff line number Diff line
@@ -2041,11 +2041,11 @@ static void bcmgenet_init_tx_napi(struct bcmgenet_priv *priv) 


	for (i = 0; i < priv->hw_params->tx_queues; ++i) {

		ring = &priv->tx_rings[i];

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

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

	}



	ring = &priv->tx_rings[DESC_INDEX];

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

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

}



static void bcmgenet_enable_tx_napi(struct bcmgenet_priv *priv)

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

+1 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ static int fs_enet_probe(struct platform_device *ofdev) 
	ndev->netdev_ops = &fs_enet_netdev_ops;

	ndev->watchdog_timeo = 2 * HZ;

	netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi, fpi->napi_weight);

	netif_napi_add(ndev, &fep->napi_tx, fs_enet_tx_napi, 2);

	netif_tx_napi_add(ndev, &fep->napi_tx, fs_enet_tx_napi, 2);



	ndev->ethtool_ops = &fs_ethtool_ops;

drivers/net/ethernet/freescale/gianfar.c

+2 −2
Original line number Diff line number Diff line
@@ -1347,12 +1347,12 @@ static int gfar_probe(struct platform_device *ofdev) 
		if (priv->poll_mode == GFAR_SQ_POLLING) {

			netif_napi_add(dev, &priv->gfargrp[i].napi_rx,

				       gfar_poll_rx_sq, GFAR_DEV_WEIGHT);

			netif_napi_add(dev, &priv->gfargrp[i].napi_tx,

			netif_tx_napi_add(dev, &priv->gfargrp[i].napi_tx,

				       gfar_poll_tx_sq, 2);

		} else {

			netif_napi_add(dev, &priv->gfargrp[i].napi_rx,

				       gfar_poll_rx, GFAR_DEV_WEIGHT);

			netif_napi_add(dev, &priv->gfargrp[i].napi_tx,

			netif_tx_napi_add(dev, &priv->gfargrp[i].napi_tx,

				       gfar_poll_tx, 2);

		}

	}

drivers/net/ethernet/mellanox/mlx4/en_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
	cq->mcq.event = mlx4_en_cq_event;



	if (cq->is_tx) {

		netif_napi_add(cq->dev, &cq->napi, mlx4_en_poll_tx_cq,

		netif_tx_napi_add(cq->dev, &cq->napi, mlx4_en_poll_tx_cq,

				  NAPI_POLL_WEIGHT);

	} else {

		netif_napi_add(cq->dev, &cq->napi, mlx4_en_poll_rx_cq, 64);