diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 10:46:13 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 16:32:38 -0800 |
| commit | c4c9f0183b7c4e97836e8fecbb67898b06c47e78 (patch) | |
| tree | 9b87d44b1cc2faf7b2a773ae0c38f19af7a992f9 | |
| parent | bf66542bef3771a42ad3b1d5dc503c804bc22b33 (diff) | |
| download | op-kernel-dev-c4c9f0183b7c4e97836e8fecbb67898b06c47e78.zip op-kernel-dev-c4c9f0183b7c4e97836e8fecbb67898b06c47e78.tar.gz | |
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.c | 2 | ||||
| -rw-r--r-- | drivers/net/ibmveth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 035aa7d..a2f1905 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) 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); diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 1f055a9..9bc0f17 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) 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; |
