aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-28 18:46:13 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 19:32:38 -0500
commitc4c9f0183b7c4e97836e8fecbb67898b06c47e78 (patch)
tree9b87d44b1cc2faf7b2a773ae0c38f19af7a992f9
parentbf66542bef3771a42ad3b1d5dc503c804bc22b33 (diff)
net: ehea NAPI interface cleanup fix
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>
-rw-r--r--drivers/net/ehea/ehea_main.c2
-rw-r--r--drivers/net/ibmveth.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 035aa7dfc5cd..a2f1905a23df 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -841,7 +841,7 @@ static int ehea_poll(struct napi_struct *napi, int budget)
841 if (!cqe && !cqe_skb) 841 if (!cqe && !cqe_skb)
842 return rx; 842 return rx;
843 843
844 if (!netif_rx_reschedule(dev, napi)) 844 if (!netif_rx_reschedule(napi))
845 return rx; 845 return rx;
846 846
847 cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES); 847 cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 1f055a955089..9bc0f178f24b 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1031,7 +1031,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
1031 netif_rx_complete(napi); 1031 netif_rx_complete(napi);
1032 1032
1033 if (ibmveth_rxq_pending_buffer(adapter) && 1033 if (ibmveth_rxq_pending_buffer(adapter) &&
1034 netif_rx_reschedule(netdev, napi)) { 1034 netif_rx_reschedule(napi)) {
1035 lpar_rc = h_vio_signal(adapter->vdev->unit_address, 1035 lpar_rc = h_vio_signal(adapter->vdev->unit_address,
1036 VIO_IRQ_DISABLE); 1036 VIO_IRQ_DISABLE);
1037 goto restart_poll; 1037 goto restart_poll;