From 509e99ac2fc3a25c6194dd51ee368868158eacdd Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 29 Dec 2008 10:46:13 +1100 Subject: [PATCH] --- yaml --- r: 122998 b: refs/heads/master c: c4c9f0183b7c4e97836e8fecbb67898b06c47e78 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ehea/ehea_main.c | 2 +- trunk/drivers/net/ibmveth.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e8ffc32cfc9..7c110b556b80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf66542bef3771a42ad3b1d5dc503c804bc22b33 +refs/heads/master: c4c9f0183b7c4e97836e8fecbb67898b06c47e78 diff --git a/trunk/drivers/net/ehea/ehea_main.c b/trunk/drivers/net/ehea/ehea_main.c index 035aa7dfc5cd..a2f1905a23df 100644 --- a/trunk/drivers/net/ehea/ehea_main.c +++ b/trunk/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/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c index 1f055a955089..9bc0f178f24b 100644 --- a/trunk/drivers/net/ibmveth.c +++ b/trunk/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;