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

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

pcnet32: use napi_complete_done() 



Use napi_complete_done() instead of __napi_complete() to :

1) Get support of gro_flush_timeout if opt-in
2) Not rearm interrupts for busy-polling users.
3) use standard NAPI API.

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

drivers/net/ethernet/amd/pcnet32.c

+3 −8
Original line number Diff line number Diff line
@@ -1350,13 +1350,8 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) 
		pcnet32_restart(dev, CSR0_START);

		netif_wake_queue(dev);

	}

	spin_unlock_irqrestore(&lp->lock, flags);



	if (work_done < budget) {

		spin_lock_irqsave(&lp->lock, flags);



		__napi_complete(napi);



	if (work_done < budget && napi_complete_done(napi, work_done)) {

		/* clear interrupt masks */

		val = lp->a->read_csr(ioaddr, CSR3);

		val &= 0x00ff;
@@ -1364,9 +1359,9 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) 


		/* Set interrupt enable. */

		lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);

	}



	spin_unlock_irqrestore(&lp->lock, flags);

	}

	return work_done;

}