]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ehea NAPI interface cleanup fix
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 28 Dec 2008 23:46:13 +0000 (10:46 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Dec 2008 00:32:38 +0000 (16:32 -0800)
Commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("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>
drivers/net/ehea/ehea_main.c
drivers/net/ibmveth.c

index 035aa7dfc5cd867e40f72f5bd06ef2b37cb01cf1..a2f1905a23dfdc2d581b8751f631515bf326a448 100644 (file)
@@ -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);
index 1f055a9550896824656b5aeb8f7d42b036c3bb0b..9bc0f178f24bfb9ff88e92ec937e19e5e9e2f47e 100644 (file)
@@ -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;