linux-next: origin tree build failure

PATCH Applied Stephen Rothwell 4 participants 6 messages Dec 29, 2008 – Dec 30, 2008

Subsystems (4)

Networking Network drivers Linux-next tree Arm/Intel IXP4XX Arm architecture

lore

Share & tools

lore

Stephen Rothwell

author

2008-12-29 00:00 UTC #0 lore raw

Hi Dave, Neil,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/net/ibmveth.c: In function 'ibmveth_poll':
drivers/net/ibmveth.c:1034: warning: passing argument 1 of 'netif_rx_reschedule' from incompatible pointer type drivers/net/ibmveth.c:1034: error: too many arguments to function 'netif_rx_reschedule'

Another miss in commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused netdev arg from some NAPI interfaces").

I have added the following patch for today.

(I wonder how many more there will be? :-()

Signature · 15 lines

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

From: Stephen Rothwell <[email protected]>
Date: Mon, 29 Dec 2008 10:56:00 +1100
Subject: [PATCH] net: ibmveth NAPI interface cleanup fix

Commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused
netdev arg from some NAPI interfaces") missed one spot.

Signed-off-by: Stephen Rothwell <[email protected]>
---
 drivers/net/ibmveth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/ibmveth.c +1 -1

index 1f055a9..9bc0f17 100644
@@ -1031,7 +1031,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 		netif_rx_complete(napi);
 
 		if (ibmveth_rxq_pending_buffer(adapter) &&
-		    netif_rx_reschedule(netdev, napi)) {
+		    netif_rx_reschedule(napi)) {
 			lpar_rc = h_vio_signal(adapter->vdev->unit_address,
 					       VIO_IRQ_DISABLE);
 			goto restart_poll;

Signature · 1 line

1.6.0.5

Kamalesh Babulal

2008-12-29 10:25 UTC #1 lore raw

PATCH 1/1 clean up of netif_rx_reschedule() changes in drivers

Quoted 8 lines · Stephen Rothwell

Hi Dave, Neil,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/net/ibmveth.c: In function 'ibmveth_poll':
drivers/net/ibmveth.c:1034: warning: passing argument 1 of 'netif_rx_reschedule' from incompatible pointer type drivers/net/ibmveth.c:1034: error: too many arguments to function 'netif_rx_reschedule'

Quoted 18 lines

Another miss in commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused netdev arg from some NAPI interfaces").
I have added the following patch for today.
(I wonder how many more there will be? :-()
Signature · 10 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <[email protected]>
Date: Mon, 29 Dec 2008 10:56:00 +1100
Subject: [PATCH] net: ibmveth NAPI interface cleanup fix

Commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused
netdev arg from some NAPI interfaces") missed one spot.

Hi Stephen,

Thanks, the patch fixes the build failure for me.

Tested-by Kamalesh Babulal <[email protected]>

Quoted 20 lines

Signed-off-by Stephen Rothwell <[email protected]>

---
 drivers/net/ibmveth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/ibmveth.c +1 -1

index 1f055a9..9bc0f17 100644
@@ -1031,7 +1031,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 		netif_rx_complete(napi);
 
 		if (ibmveth_rxq_pending_buffer(adapter) &&
-		    netif_rx_reschedule(netdev, napi)) {
+		    netif_rx_reschedule(napi)) {
 			lpar_rc = h_vio_signal(adapter->vdev->unit_address,
 					       VIO_IRQ_DISABLE);
 			goto restart_poll;

Signature · 1 line

1.6.0.5

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

greping through the sources for the changes missed out, we have

./drivers/net/arm/ixp4xx_eth.c:507: netif_rx_reschedule(dev, napi)) {
./drivers/net/arm/ep93xx_eth.c:310: if (more && netif_rx_reschedule(dev, napi))
./drivers/net/wan/ixp4xx_hss.c:657: netif_rx_reschedule(dev, napi)) {

Signed-off-by Kamalesh Babulal <[email protected]>

 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(-)

drivers/net/arm/ep93xx_eth.c +1 -1

index 6ecc600..3ec20cc 100644
@@ -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;
 	}

drivers/net/arm/ixp4xx_eth.c +1 -1

index 26af411..5fce1d5 100644
@@ -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",

drivers/net/wan/ixp4xx_hss.c +1 -1

index 0c68025..2dc2416 100644
@@ -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",

Signature · 4 lines

Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.

Stephen Rothwell

author

2008-12-29 10:41 UTC #2 lore raw

Re: [PATCH] clean up of netif_rx_reschedule() changes in drivers

Hi Kamalesh,

Quoted 7 lines · On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal…

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.

Quoted 2 lines

greping through the sources for the changes missed out, we have

	.
	.

Quoted 7 lines

Signed-off-by Kamalesh Babulal <[email protected]>

 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.

Signature · 3 lines

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

Neil Horman

Acked-by

2008-12-29 15:37 UTC #3 lore raw

Re: [PATCH] clean up of netif_rx_reschedule() changes in drivers

Quoted 18 lines · Stephen Rothwell

Hi Kamalesh,
Quoted 7 lines · On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal…
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.
Quoted 2 lines
greping through the sources for the changes missed out, we have
	.
	.
Quoted 1 line

Quoted 12 lines

Quoted 6 lines
Signed-off-by Kamalesh Babulal <[email protected]>
--
 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.
Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

Thanks guys, not sure how my patch missed that. I did an allmodconfig build that passed successfully. Thanks!

Acked-by Neil Horman <[email protected]>

David Miller

maintainer Applied

2008-12-30 02:19 UTC #4 lore raw

Re: [PATCH] clean up of netif_rx_reschedule() changes in drivers

From: Neil Horman <[email protected]>
Date: Mon, 29 Dec 2008 10:37:57 -0500

Quoted 10 lines · Stephen Rothwell

Quoted 9 lines
Hi Kamalesh,
Quoted 2 lines · On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal…
greping through the sources for the changes missed out, we have
	.
	.
Quoted 2 lines
Signed-off-by Kamalesh Babulal <[email protected]>

...

Quoted 2 lines

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 :-)

Quoted 1 line

Acked-by Neil Horman <[email protected]>

Applied, thanks everyone.

Neil Horman

2008-12-30 16:39 UTC #5 lore raw

Re: [PATCH] clean up of netif_rx_reschedule() changes in drivers

Quoted 12 lines · David Miller

From: Neil Horman <[email protected]>
Date: Mon, 29 Dec 2008 10:37:57 -0500
Quoted 9 lines · Stephen Rothwell
Quoted 8 lines
Hi Kamalesh,
Quoted 2 lines · On Mon, 29 Dec 2008 15:55:29 +0530 Kamalesh Babulal…
greping through the sources for the changes missed out, we have
	.
	.
Quoted 1 line

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Signed-off-by Kamalesh Babulal <[email protected]>
...
Quoted 2 lines
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.

Quoted 4 lines

Quoted 1 line
Acked-by Neil Horman <[email protected]>
Applied, thanks everyone.