* linux-next: net-current/net tree build failure
@ 2009-03-13 2:16 Stephen Rothwell
2009-03-13 10:30 ` [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_* Ilya Yanok
2009-03-13 17:23 ` linux-next: net-current/net tree build failure David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2009-03-13 2:16 UTC (permalink / raw)
To: David S. Miller; +Cc: linux-next, Ben Hutchings, Ilya Yanok
[-- Attachment #1: Type: text/plain, Size: 982 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_* 2009-03-13 2:16 linux-next: net-current/net tree build failure Stephen Rothwell @ 2009-03-13 10:30 ` Ilya Yanok 2009-03-13 16:51 ` David Miller 2009-03-13 17:23 ` linux-next: net-current/net tree build failure David Miller 1 sibling, 1 reply; 5+ messages in thread From: Ilya Yanok @ 2009-03-13 10:30 UTC (permalink / raw) To: sfr; +Cc: davem, linux-next, bhutchings, Ilya Yanok *netif_rx_* functions is obsolete and removed in newer kernels so we need to use corresponding *napi_* functions instead. Signed-off-by: Ilya Yanok <yanok@emcraft•com> --- 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_* 2009-03-13 10:30 ` [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_* Ilya Yanok @ 2009-03-13 16:51 ` David Miller 0 siblings, 0 replies; 5+ messages in thread From: David Miller @ 2009-03-13 16:51 UTC (permalink / raw) To: yanok; +Cc: sfr, linux-next, bhutchings From: Ilya Yanok <yanok@emcraft•com> 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 <yanok@emcraft•com> Applied, thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: net-current/net tree build failure 2009-03-13 2:16 linux-next: net-current/net tree build failure Stephen Rothwell 2009-03-13 10:30 ` [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_* Ilya Yanok @ 2009-03-13 17:23 ` David Miller 2009-03-15 11:30 ` Stephen Rothwell 1 sibling, 1 reply; 5+ messages in thread From: David Miller @ 2009-03-13 17:23 UTC (permalink / raw) To: sfr; +Cc: linux-next, bhutchings, yanok From: Stephen Rothwell <sfr@canb•auug.org.au> Date: Fri, 13 Mar 2009 13:16:55 +1100 > 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. This should be fixed now thanks to Ilya's patch which is now in net-2.6, thanks! ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: net-current/net tree build failure 2009-03-13 17:23 ` linux-next: net-current/net tree build failure David Miller @ 2009-03-15 11:30 ` Stephen Rothwell 0 siblings, 0 replies; 5+ messages in thread From: Stephen Rothwell @ 2009-03-15 11:30 UTC (permalink / raw) To: David Miller; +Cc: linux-next, bhutchings, yanok [-- Attachment #1: Type: text/plain, Size: 317 bytes --] Hi Dave, On Fri, 13 Mar 2009 10:23:35 -0700 (PDT) David Miller <davem@davemloft•net> wrote: > > This should be fixed now thanks to Ilya's patch which is now in > net-2.6, thanks! Excellent, thanks. -- Cheers, Stephen Rothwell sfr@canb•auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-03-15 11:30 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-03-13 2:16 linux-next: net-current/net tree build failure Stephen Rothwell 2009-03-13 10:30 ` [PATCH] dnet: replace obsolete *netif_rx_* functions with *napi_* Ilya Yanok 2009-03-13 16:51 ` David Miller 2009-03-13 17:23 ` linux-next: net-current/net tree build failure David Miller 2009-03-15 11:30 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox