bcm63xx_enet: fix poll callback. (cd33ccf5) · Commits · 戴 / test

In case there was some tx buffer reclaimed and not enough rx packets to consume the whole budget, napi_complete would not be called and interrupts would be kept disabled, effectively resulting in the network core never to call the poll callback again and no rx/tx interrupts to be fired either. Fix that by only accounting the rx work done in the poll callback. Signed-off-by:

Nicolas Schichan <nschichan@freebox.fr> Acked-by:

Eric Dumazet <edumazet@google.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
		{
		struct bcm_enet_priv *priv;
		struct net_device *dev;
		int tx_work_done, rx_work_done;
		int rx_work_done;

		priv = container_of(napi, struct bcm_enet_priv, napi);
		dev = priv->net_dev;
		@@ -498,14 +498,14 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
		ENETDMAC_IR, priv->tx_chan);

		/* reclaim sent skb */
		tx_work_done = bcm_enet_tx_reclaim(dev, 0);
		bcm_enet_tx_reclaim(dev, 0);

		spin_lock(&priv->rx_lock);
		rx_work_done = bcm_enet_receive_queue(dev, budget);
		spin_unlock(&priv->rx_lock);

		if (rx_work_done >= budget \|\| tx_work_done > 0) {
		/* rx/tx queue is not yet empty/clean */
		if (rx_work_done >= budget) {
		/* rx queue is not yet empty/clean */
		return rx_work_done;
		}

Admin message