Subject: [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_*

From: Ilya Yanok <[email-masked]>
Date: Fri, 13 Mar 2009 13:30:53 +0300

*netif_rx_* functions is obsolete and removed in newer kernels so
we need to use corresponding *napi_* functions instead.

Signed-off-by: Ilya Yanok <[email-masked]>
---

Here is a fix for the problem. Or should I post an updated cumulative patch?

Regards, Ilya.

---
 drivers/net/dnet.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index dd7bf4e..35eaa17 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -441,7 +441,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
 		 * packets waiting
 		 */
 		if (!(dnet_readl(bp, RX_FIFO_WCNT) >> 16)) {
-			netif_rx_complete(napi);
+			napi_complete(napi);
 			int_enable = dnet_readl(bp, INTR_ENB);
 			int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
 			dnet_writel(bp, int_enable, INTR_ENB);
@@ -480,7 +480,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
 	if (npackets < budget) {
 		/* We processed all packets available.  Tell NAPI it can
 		 * stop polling then re-enable rx interrupts */
-		netif_rx_complete(napi);
+		napi_complete(napi);
 		int_enable = dnet_readl(bp, INTR_ENB);
 		int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
 		dnet_writel(bp, int_enable, INTR_ENB);
@@ -540,7 +540,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id)
 	}
 
 	if (int_current & DNET_INTR_SRC_RX_CMDFIFOAF) {
-		if (netif_rx_schedule_prep(&bp->napi)) {
+		if (napi_schedule_prep(&bp->napi)) {
 			/*
 			 * There's no point taking any more interrupts
 			 * until we have processed the buffers
@@ -549,7 +549,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id)
 			int_enable = dnet_readl(bp, INTR_ENB);
 			int_enable &= ~DNET_INTR_SRC_RX_CMDFIFOAF;
 			dnet_writel(bp, int_enable, INTR_ENB);
-			__netif_rx_schedule(&bp->napi);
+			__napi_schedule(&bp->napi);
 		}
 		handled = 1;
 	}
-- 
1.6.0.6