* [PATCH 9/9] staging/sxg: fix napi interface build
@ 2009-02-11 21:22 Randy Dunlap
2009-02-12 19:51 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2009-02-11 21:22 UTC (permalink / raw)
To: lkml; +Cc: gregkh
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix staging/sxg napi interface calls:
drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep'
linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule'
drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/sxg/sxg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- mmotm-2009-0210-1635.orig/drivers/staging/sxg/sxg.c
+++ mmotm-2009-0210-1635/drivers/staging/sxg/sxg.c
@@ -1268,8 +1268,8 @@ static void sxg_interrupt(struct adapter
{
WRITE_REG(adapter->UcodeRegs[0].Icr, SXG_ICR(0, SXG_ICR_MASK), TRUE);
- if (netif_rx_schedule_prep(&adapter->napi)) {
- __netif_rx_schedule(&adapter->napi);
+ if (napi_schedule_prep(&adapter->napi)) {
+ __napi_schedule(&adapter->napi);
}
}
@@ -1322,7 +1322,7 @@ static int sxg_poll(struct napi_struct *
sxg_handle_interrupt(adapter, &work_done, budget);
if (work_done < budget) {
- netif_rx_complete(napi);
+ napi_complete(napi);
WRITE_REG(adapter->UcodeRegs[0].Isr, 0, TRUE);
}
return work_done;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 9/9] staging/sxg: fix napi interface build
2009-02-11 21:22 [PATCH 9/9] staging/sxg: fix napi interface build Randy Dunlap
@ 2009-02-12 19:51 ` Greg KH
2009-02-12 22:56 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2009-02-12 19:51 UTC (permalink / raw)
To: Randy Dunlap; +Cc: lkml, gregkh
On Wed, Feb 11, 2009 at 01:22:56PM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix staging/sxg napi interface calls:
>
> drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep'
> linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule'
> drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'
As I count over 80 instances of netif_rx_complete in Linus's tree right
now, I'm guesing this is due to a change from the netdev tree. Which is
fine, but I'll wait until that gets merged with Linus to apply this
patch.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 9/9] staging/sxg: fix napi interface build
2009-02-12 19:51 ` Greg KH
@ 2009-02-12 22:56 ` David Miller
2009-02-12 23:08 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2009-02-12 22:56 UTC (permalink / raw)
To: greg; +Cc: randy.dunlap, linux-kernel, gregkh
From: Greg KH <greg@kroah.com>
Date: Thu, 12 Feb 2009 11:51:33 -0800
> On Wed, Feb 11, 2009 at 01:22:56PM -0800, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Fix staging/sxg napi interface calls:
> >
> > drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep'
> > linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule'
> > drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'
>
> As I count over 80 instances of netif_rx_complete in Linus's tree right
> now, I'm guesing this is due to a change from the netdev tree. Which is
> fine, but I'll wait until that gets merged with Linus to apply this
> patch.
Well it means that it won't build in -next until the next merge
window.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 9/9] staging/sxg: fix napi interface build
2009-02-12 22:56 ` David Miller
@ 2009-02-12 23:08 ` Greg KH
2009-02-12 23:22 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2009-02-12 23:08 UTC (permalink / raw)
To: David Miller; +Cc: greg, randy.dunlap, linux-kernel
On Thu, Feb 12, 2009 at 02:56:20PM -0800, David Miller wrote:
> From: Greg KH <greg@kroah.com>
> Date: Thu, 12 Feb 2009 11:51:33 -0800
>
> > On Wed, Feb 11, 2009 at 01:22:56PM -0800, Randy Dunlap wrote:
> > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > >
> > > Fix staging/sxg napi interface calls:
> > >
> > > drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep'
> > > linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule'
> > > drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'
> >
> > As I count over 80 instances of netif_rx_complete in Linus's tree right
> > now, I'm guesing this is due to a change from the netdev tree. Which is
> > fine, but I'll wait until that gets merged with Linus to apply this
> > patch.
>
> Well it means that it won't build in -next until the next merge
> window.
I can live with that :)
Or is the new api already there and it's safe to make this change now?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 9/9] staging/sxg: fix napi interface build
2009-02-12 23:08 ` Greg KH
@ 2009-02-12 23:22 ` David Miller
2009-02-13 0:45 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2009-02-12 23:22 UTC (permalink / raw)
To: gregkh; +Cc: greg, randy.dunlap, linux-kernel
From: Greg KH <gregkh@suse.de>
Date: Thu, 12 Feb 2009 15:08:46 -0800
> On Thu, Feb 12, 2009 at 02:56:20PM -0800, David Miller wrote:
> > From: Greg KH <greg@kroah.com>
> > Date: Thu, 12 Feb 2009 11:51:33 -0800
> >
> > > On Wed, Feb 11, 2009 at 01:22:56PM -0800, Randy Dunlap wrote:
> > > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > >
> > > > Fix staging/sxg napi interface calls:
> > > >
> > > > drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep'
> > > > linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule'
> > > > drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'
> > >
> > > As I count over 80 instances of netif_rx_complete in Linus's tree right
> > > now, I'm guesing this is due to a change from the netdev tree. Which is
> > > fine, but I'll wait until that gets merged with Linus to apply this
> > > patch.
> >
> > Well it means that it won't build in -next until the next merge
> > window.
>
> I can live with that :)
>
> Or is the new api already there and it's safe to make this change now?
If you make the change, your driver will build in Linus's
tree. Just sed 's/netif_rx_/napi_/' for the lines the
above warning triggers on.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 9/9] staging/sxg: fix napi interface build
2009-02-12 23:22 ` David Miller
@ 2009-02-13 0:45 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2009-02-13 0:45 UTC (permalink / raw)
To: David Miller; +Cc: greg, randy.dunlap, linux-kernel
On Thu, Feb 12, 2009 at 03:22:05PM -0800, David Miller wrote:
> From: Greg KH <gregkh@suse.de>
> Date: Thu, 12 Feb 2009 15:08:46 -0800
>
> > On Thu, Feb 12, 2009 at 02:56:20PM -0800, David Miller wrote:
> > > From: Greg KH <greg@kroah.com>
> > > Date: Thu, 12 Feb 2009 11:51:33 -0800
> > >
> > > > On Wed, Feb 11, 2009 at 01:22:56PM -0800, Randy Dunlap wrote:
> > > > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > > >
> > > > > Fix staging/sxg napi interface calls:
> > > > >
> > > > > drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep'
> > > > > linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule'
> > > > > drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'
> > > >
> > > > As I count over 80 instances of netif_rx_complete in Linus's tree right
> > > > now, I'm guesing this is due to a change from the netdev tree. Which is
> > > > fine, but I'll wait until that gets merged with Linus to apply this
> > > > patch.
> > >
> > > Well it means that it won't build in -next until the next merge
> > > window.
> >
> > I can live with that :)
> >
> > Or is the new api already there and it's safe to make this change now?
>
> If you make the change, your driver will build in Linus's
> tree. Just sed 's/netif_rx_/napi_/' for the lines the
> above warning triggers on.
Ah, sorry, didn't realize that. I'll go apply the patch now, sorry for
the noise...
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-02-13 0:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-11 21:22 [PATCH 9/9] staging/sxg: fix napi interface build Randy Dunlap
2009-02-12 19:51 ` Greg KH
2009-02-12 22:56 ` David Miller
2009-02-12 23:08 ` Greg KH
2009-02-12 23:22 ` David Miller
2009-02-13 0:45 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).