Skip to contentSkip to conversation

linux-next: net-current/net tree build failure

PATCH Applied Stephen Rothwell 3 participants 5 messages Mar 13, 2009 – Mar 15, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/dnet.c: In function 'dnet_poll':
drivers/net/dnet.c:411: error: implicit declaration of function 'netif_rx_complete' drivers/net/dnet.c: In function 'dnet_interrupt':
drivers/net/dnet.c:510: error: implicit declaration of function 'netif_rx_schedule_prep' drivers/net/dnet.c:519: error: implicit declaration of function '__netif_rx_schedule'

Caused by commit 4796417417a62e2ae83d92cb92e1ecf9ec67b5f5 ("dnet: Dave DNET ethernet controller driver (updated)") from the net-current tree interacting with commit 288379f050284087578b77e04f040b57db3db3f8 ("net:
Remove redundant NAPI functions") from the net tree.

So for today, I have reverted the net-current commit and commit 2c5849ea38fdad477d72dcf1c8c4842db4b33aae ("dnet: Fix warnings on 64-bit") that depended on it.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#1 lore raw

PATCH 1/1 dnet: replace obsolete *netif_rx_* functions with *napi_*

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

---

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(-)
drivers/net/dnet.c +4 -4
index dd7bf4e..35eaa17 100644
@@ -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;
 	}
Signature · 1 line
1.6.0.6
maintainer Applied
#2 lore raw

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

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

Quoted 4 lines

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

Applied, thanks.

maintainer
#3 lore raw
In reply to Stephen Rothwell

From: Stephen Rothwell <[email protected]>
Date: Fri, 13 Mar 2009 13:16:55 +1100

Quoted 8 lines

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/dnet.c: In function 'dnet_poll':
drivers/net/dnet.c:411: error: implicit declaration of function 'netif_rx_complete' drivers/net/dnet.c: In function 'dnet_interrupt':
drivers/net/dnet.c:510: error: implicit declaration of function 'netif_rx_schedule_prep' drivers/net/dnet.c:519: error: implicit declaration of function '__netif_rx_schedule'

Quoted 8 lines

Caused by commit 4796417417a62e2ae83d92cb92e1ecf9ec67b5f5 ("dnet: Dave DNET ethernet controller driver (updated)") from the net-current tree interacting with commit 288379f050284087578b77e04f040b57db3db3f8 ("net:
Remove redundant NAPI functions") from the net tree.

So for today, I have reverted the net-current commit and commit 2c5849ea38fdad477d72dcf1c8c4842db4b33aae ("dnet: Fix warnings on 64-bit") that depended on it.

This should be fixed now thanks to Ilya's patch which is now in net-2.6, thanks!

#4 lore raw

Hi Dave,

Quoted 3 lines · On Fri, 13 Mar 2009 10:23:35 -0700 (PDT) David Miller <[email protected]>…

This should be fixed now thanks to Ilya's patch which is now in net-2.6, thanks!

Excellent, thanks.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/