linux-kernel - [PATCH] clean up of netif_rx_reschedule() changes in drivers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20081229102509.GA11111@linux.vnet.ibm.com>
Date:	Mon, 29 Dec 2008 15:55:29 +0530
From:	Kamalesh Babulal <kamalesh@...ux.vnet.ibm.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"David S. Miller" <davem@...emloft.net>,
	Neil Horman <nhorman@...driver.com>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	Linus <torvalds@...ux-foundation.org>, netdev@...r.kernel.org,
	ppc-dev <linuxppc-dev@...abs.org>
Subject: [PATCH] clean up of netif_rx_reschedule() changes in drivers

* Stephen Rothwell <sfr@...b.auug.org.au> [2008-12-29 11:00:41]:

> 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? :-()
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> 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 <kamalesh@...ux.vnet.ibm.com>
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/net/ibmveth.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
> index 1f055a9..9bc0f17 100644
> --- a/drivers/net/ibmveth.c
> +++ b/drivers/net/ibmveth.c
> @@ -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;
> -- 
> 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 <kamalesh@...ux.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(-)

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",
-- 
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/