Message ID | 20081229102509.GA11111@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Accepted, archived |
Commit | 2d0658d4ef92e4958172c832bd88c961840e599e |
Headers | show |
Hi Kamalesh, On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote: > > I hit similar build failure due to the change in the netif_rx_reschedule() > > drivers/net/ehea/ehea_main.c: In function 'ehea_poll': > drivers/net/ehea/ehea_main.c:844: warning: passing argument 1 of 'netif_rx_reschedule' from incompatible pointer type > drivers/net/ehea/ehea_main.c:844: error: too many arguments to function 'netif_rx_reschedule' > make[3]: *** [drivers/net/ehea/ehea_main.o] Error 1 Linus already took a patch for ibmveth and ehea. > greping through the sources for the changes missed out, we have > . . > > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> > -- > drivers/net/arm/ep93xx_eth.c | 2 +- > drivers/net/arm/ixp4xx_eth.c | 2 +- > drivers/net/wan/ixp4xx_hss.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Thanks for the patch, I assume that Dave or Linus will take care of that.
From: Neil Horman <nhorman@tuxdriver.com> Date: Mon, 29 Dec 2008 10:37:57 -0500 > On Mon, Dec 29, 2008 at 09:41:44PM +1100, Stephen Rothwell wrote: > > Hi Kamalesh, > > > > On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote: > > > greping through the sources for the changes missed out, we have > > > > > . > > . > > > > > > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> ... > Thanks guys, not sure how my patch missed that. I did an allmodconfig build > that passed successfully. Thanks! It's very simple, you're not building on powerpc or ARM :-) > Acked-by: Neil Horman <nhorman@tuxdriver.com> Applied, thanks everyone.
On Mon, Dec 29, 2008 at 06:19:08PM -0800, David Miller wrote: > From: Neil Horman <nhorman@tuxdriver.com> > Date: Mon, 29 Dec 2008 10:37:57 -0500 > > > On Mon, Dec 29, 2008 at 09:41:44PM +1100, Stephen Rothwell wrote: > > > Hi Kamalesh, > > > > > > On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote: > > > > greping through the sources for the changes missed out, we have > > > > > > > . > > > . > > > > > > > > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> > ... > > Thanks guys, not sure how my patch missed that. I did an allmodconfig build > > that passed successfully. Thanks! > > It's very simple, you're not building on powerpc or ARM :-) > Doh! Stupid of me. apologies. > > Acked-by: Neil Horman <nhorman@tuxdriver.com> > > Applied, thanks everyone. >
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 6ecc600..3ec20cc 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c @@ -307,7 +307,7 @@ poll_some_more: } spin_unlock_irq(&ep->rx_lock); - if (more && netif_rx_reschedule(dev, napi)) + if (more && netif_rx_reschedule(napi)) goto poll_some_more; } diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 26af411..5fce1d5 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c @@ -504,7 +504,7 @@ static int eth_poll(struct napi_struct *napi, int budget) netif_rx_complete(napi); qmgr_enable_irq(rxq); if (!qmgr_stat_empty(rxq) && - netif_rx_reschedule(dev, napi)) { + netif_rx_reschedule(napi)) { #if DEBUG_RX printk(KERN_DEBUG "%s: eth_poll" " netif_rx_reschedule successed\n", diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 0c68025..2dc2416 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c @@ -654,7 +654,7 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget) netif_rx_complete(dev, napi); qmgr_enable_irq(rxq); if (!qmgr_stat_empty(rxq) && - netif_rx_reschedule(dev, napi)) { + netif_rx_reschedule(napi)) { #if DEBUG_RX printk(KERN_DEBUG "%s: hss_hdlc_poll" " netif_rx_reschedule succeeded\n",