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

Commit c4c9f018 authored Dec 29, 2008 by Stephen Rothwell Committed by Linus Torvalds Dec 28, 2008

net: ehea NAPI interface cleanup fix



Commit 908a7a16 ("net: Remove unused
netdev arg from some NAPI interfaces") missed two spots.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bf66542b

drivers/net/ehea/ehea_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -841,7 +841,7 @@ static int ehea_poll(struct napi_struct *napi, int budget)
		if (!cqe && !cqe_skb)
		return rx;

		if (!netif_rx_reschedule(dev, napi))
		if (!netif_rx_reschedule(napi))
		return rx;

		cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);

drivers/net/ibmveth.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1031,7 +1031,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
		netif_rx_complete(napi);

		if (ibmveth_rxq_pending_buffer(adapter) &&
		netif_rx_reschedule(netdev, napi)) {
		netif_rx_reschedule(napi)) {
		lpar_rc = h_vio_signal(adapter->vdev->unit_address,
		VIO_IRQ_DISABLE);
		goto restart_poll;