From: Stephen Rothwell Date: Sun, 28 Dec 2008 23:46:13 +0000 (+1100) Subject: net: ehea NAPI interface cleanup fix X-Git-Tag: firefly_0821_release~16475 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4c9f0183b7c4e97836e8fecbb67898b06c47e78;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Linus Torvalds --- 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) 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 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) 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;