linux-next: net tree build warning

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 669 bytes --]

Hi Dave,

Today's linux-next build (powerpc allyesconfig) produced these warnings:

drivers/net/wimax/i2400m/netdev.c: In function 'i2400m_net_erx':
drivers/net/wimax/i2400m/netdev.c:523: warning: format '%zu' expects type 'size_t', but argument 7 has type 'unsigned int'
drivers/net/wimax/i2400m/netdev.c:548: warning: format '%zu' expects type 'size_t', but argument 7 has type 'unsigned int'

Probably introduced by commit fd5c565c0c04d2716cfdac3f1de3c2261d6a457d
("wimax/i2400m: support extended data RX protocol (no need to reallocate
skbs)").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: net tree build warning

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Mar 2009 16:58:57 +1100

> Hi Dave,
> 
> Today's linux-next build (powerpc allyesconfig) produced these warnings:
> 
> drivers/net/wimax/i2400m/netdev.c: In function 'i2400m_net_erx':
> drivers/net/wimax/i2400m/netdev.c:523: warning: format '%zu' expects type 'size_t', but argument 7 has type 'unsigned int'
> drivers/net/wimax/i2400m/netdev.c:548: warning: format '%zu' expects type 'size_t', but argument 7 has type 'unsigned int'
> 
> Probably introduced by commit fd5c565c0c04d2716cfdac3f1de3c2261d6a457d
> ("wimax/i2400m: support extended data RX protocol (no need to reallocate
> skbs)").

I just pushed Randy Dunlap's fix for this into the tree.

Thanks.

Re: linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

Hi Dave,

On Wed, 11 Mar 2009 23:24:28 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just pushed Randy Dunlap's fix for this into the tree.

I should have known there would be one. :-)

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 --]

Re: linux-next: net tree build warning

[Andrei Pelinescu-Onciul]

On Nov 30, 2009 at 16:40, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
> 
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
> 
> net/sctp/socket.c: In function 'sctp_setsockopt_autoclose':
> net/sctp/socket.c:2091: warning: large integer implicitly truncated to unsigned type
> 
> Introduced by commit f6778aab6ccc4b510b4dcfa770d9949b696b4545 ("sctp:
> limit maximum autoclose setsockopt value") from the net tree.

Thanks, the fix is:

-               sp->autoclose = MAX_SCHEDULE_TIMEOUT / HZ ;
+               sp->autoclose = (__u32)(MAX_SCHEDULE_TIMEOUT / HZ) ;

I'll reply to this mail with the patch in git format.

Andrei

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

net/sctp/socket.c: In function 'sctp_setsockopt_autoclose':
net/sctp/socket.c:2091: warning: large integer implicitly truncated to unsigned type

Introduced by commit f6778aab6ccc4b510b4dcfa770d9949b696b4545 ("sctp:
limit maximum autoclose setsockopt value") from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

Hi Dave,

On Wed, 11 Nov 2009 18:53:38 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> I just pushed a fix for this into net-next-2.6, thanks!

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: net tree build warning

[Eric Dumazet]

David Miller a écrit :
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 12 Nov 2009 13:24:24 +1100
> 
>> Hi Dave,
>>
>> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>>
>> net/ipv6/addrconf.c: In function 'inet6_dump_ifinfo':
>> net/ipv6/addrconf.c:3833: warning: unused variable 'err'
>>
>> Introduced by commit 84d2697d9649339215675551eae28ba04068dea1 ("ipv6:
>> speedup inet6_dump_ifinfo()").
> 
> I just pushed a fix for this into net-next-2.6, thanks!

You beat me :)

Thanks

Re: linux-next: net tree build warning

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 13:24:24 +1100

> Hi Dave,
> 
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
> 
> net/ipv6/addrconf.c: In function 'inet6_dump_ifinfo':
> net/ipv6/addrconf.c:3833: warning: unused variable 'err'
> 
> Introduced by commit 84d2697d9649339215675551eae28ba04068dea1 ("ipv6:
> speedup inet6_dump_ifinfo()").

I just pushed a fix for this into net-next-2.6, thanks!

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

net/ipv6/addrconf.c: In function 'inet6_dump_ifinfo':
net/ipv6/addrconf.c:3833: warning: unused variable 'err'

Introduced by commit 84d2697d9649339215675551eae28ba04068dea1 ("ipv6:
speedup inet6_dump_ifinfo()").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

net/ipv4/devinet.c: In function 'inet_select_addr':
net/ipv4/devinet.c:902: warning: label 'out' defined but not used

Probably introduced by commit c6d14c84566d6b70ad9dc1618db0dec87cca9300
("net: Introduce for_each_netdev_rcu() iterator").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

Hi Dave, Stephen,

On Mon, 07 Sep 2009 02:04:23 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Thanks for the report, I'll commit the fix below.
> 
> Also, Stephen Hemminger has fixed the dlci WAN driver warning
> you reported too.

Thanks for both of these.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: net tree build warning

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Sep 2009 14:42:32 +1000

> Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced this warning:
> 
> drivers/net/r8169.c: In function 'rtl8169_start_xmit':
> drivers/net/r8169.c:3421: warning: label 'out' defined but not used
> 
> Introduced by commit 61357325f377889a1daffa14962d705dc814dd0e ("netdev:
> convert bulk of drivers to netdev_tx_t").

Thanks for the report, I'll commit the fix below.

Also, Stephen Hemminger has fixed the dlci WAN driver warning
you reported too.

r8169: Fix warning in rtl8169_start_xmit().

Reported by Stephen Rothwell:

drivers/net/r8169.c: In function 'rtl8169_start_xmit':
drivers/net/r8169.c:3421: warning: label 'out' defined but not used

Introduced by commit 61357325f377889a1daffa14962d705dc814dd0e ("netdev:
convert bulk of drivers to netdev_tx_t").

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/r8169.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a91e9b3..50c6a3c 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3416,7 +3416,6 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
 			netif_wake_queue(dev);
 	}
 
-out:
 	return NETDEV_TX_OK;
 
 err_stop:
-- 
1.6.4.2

Re: linux-next: net tree build warning

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Sep 2009 14:28:46 +1000

> Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced this
> warning:

Thanks, just pushed the following out:

WAN: dscc4: Fix warning pointing out a bug.

Noticed by Stephen Rothwell:

	Today's linux-next build (x86_64 allmodconfig gcc-4.4.0)
	produced this warning:

	drivers/net/wan/dscc4.c: In function 'dscc4_rx_skb':
	drivers/net/wan/dscc4.c:670: warning: suggest parentheses around comparison in operand of '|'

	which actually points out a bug, I think.  It is doing
		(x & (y | z)) != y | z
	when it probably means
		(x & (y | z)) != (y | z)

	Introduced by commit 5de3fcab91b0e1809eec030355d15801daf25083
	("WAN: bit and/or confusion").

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/wan/dscc4.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index b2247bd..81c8aec 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -667,7 +667,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
 		else if (!(skb->data[pkt_len] & FrameCrc))
 			dev->stats.rx_crc_errors++;
 		else if ((skb->data[pkt_len] & (FrameVfr | FrameRab)) !=
-				FrameVfr | FrameRab)
+			 (FrameVfr | FrameRab))
 			dev->stats.rx_length_errors++;
 		dev->stats.rx_errors++;
 		dev_kfree_skb_irq(skb);
-- 
1.6.4.2

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced this
warning:

drivers/net/wan/dscc4.c: In function 'dscc4_rx_skb':
drivers/net/wan/dscc4.c:670: warning: suggest parentheses around comparison in operand of '|'

which actually points out a bug, I think.  It is doing
	(x & (y | z)) != y | z
when it probably means
	(x & (y | z)) != (y | z)

Introduced by commit 5de3fcab91b0e1809eec030355d15801daf25083 ("WAN: bit
and/or confusion").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: net tree build warning

[David Miller]

From: Wolfgang Grandegger <wg@grandegger.com>
Date: Wed, 10 Jun 2009 09:38:55 +0200

> [PATCH v2] can: sja1000_of_platform: fix build problems with printk format
> 
> According to "Documentation/printk-formats.txt", if the type is
> dependent on a config option for its size, like resource_size_t,
> we should use a format specifier of its largest possible type and
> explicitly cast to it.
> 
> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>

Applied, thank you!

Re: linux-next: net tree build warning

[Wolfgang Grandegger]

David Miller wrote:
> From: Wolfgang Grandegger <wg@grandegger.com>
> Date: Tue, 09 Jun 2009 15:14:38 +0200
> 
>> David Miller wrote:
>>> From: Wolfgang Grandegger <wg@grandegger.com>
>>> Date: Tue, 09 Jun 2009 13:25:27 +0200
>>>
>>>> [PATCH] can: sja1000_of_platform: fix build problems with printk format
>>>>
>>>> Variables of type size_t should be printed with the format "%zx".
>>>>
>>>> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
>>> It's not a "size_t", it's a "resource_size_t" which can be
>>> "unsigned long long" on some platforms.
>> Right, but I assume that the %zx handles that type properly as well.
> 
> It absolutely does not.b
> 
> resource_size_t is a arch specifically defined type that
> could be anything, it does not conform to the definitions
> of size_t.

Right, I'm now compiling on a x86_64 system and can reproduce the
warnings. Below is a revised patch.

Thanks for your patience.

Wolfgang.


[PATCH v2] can: sja1000_of_platform: fix build problems with printk format

According to "Documentation/printk-formats.txt", if the type is
dependent on a config option for its size, like resource_size_t,
we should use a format specifier of its largest possible type and
explicitly cast to it.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
---
 drivers/net/can/sja1000/sja1000_of_platform.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_of_platform.c	2009-06-09 12:45:38.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c	2009-06-10 09:23:47.208720083 +0200
@@ -108,15 +108,17 @@
 	res_size = resource_size(&res);
 
 	if (!request_mem_region(res.start, res_size, DRV_NAME)) {
-		dev_err(&ofdev->dev, "couldn't request %#x..%#x\n",
-			res.start, res.end);
+		dev_err(&ofdev->dev, "couldn't request %#llx..%#llx\n",
+			(unsigned long long)res.start,
+			(unsigned long long)res.end);
 		return -EBUSY;
 	}
 
 	base = ioremap_nocache(res.start, res_size);
 	if (!base) {
-		dev_err(&ofdev->dev, "couldn't ioremap %#x..%#x\n",
-			res.start, res.end);
+		dev_err(&ofdev->dev, "couldn't ioremap %#llx..%#llx\n",
+			(unsigned long long)res.start,
+			(unsigned long long)res.end);
 		err = -ENOMEM;
 		goto exit_release_mem;
 	}

Re: linux-next: net tree build warning

[David Miller]

From: Wolfgang Grandegger <wg@grandegger.com>
Date: Tue, 09 Jun 2009 15:14:38 +0200

> David Miller wrote:
>> From: Wolfgang Grandegger <wg@grandegger.com>
>> Date: Tue, 09 Jun 2009 13:25:27 +0200
>> 
>>> [PATCH] can: sja1000_of_platform: fix build problems with printk format
>>>
>>> Variables of type size_t should be printed with the format "%zx".
>>>
>>> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
>> 
>> It's not a "size_t", it's a "resource_size_t" which can be
>> "unsigned long long" on some platforms.
> 
> Right, but I assume that the %zx handles that type properly as well.

It absolutely does not.

resource_size_t is a arch specifically defined type that
could be anything, it does not conform to the definitions
of size_t.

Re: linux-next: net tree build warning

[Wolfgang Grandegger]

David Miller wrote:
> From: Wolfgang Grandegger <wg@grandegger.com>
> Date: Tue, 09 Jun 2009 13:25:27 +0200
> 
>> [PATCH] can: sja1000_of_platform: fix build problems with printk format
>>
>> Variables of type size_t should be printed with the format "%zx".
>>
>> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
> 
> It's not a "size_t", it's a "resource_size_t" which can be
> "unsigned long long" on some platforms.

Right, but I assume that the %zx handles that type properly as well.
Should I send a patch with a corrected patch description?

Wolfgang.

Re: linux-next: net tree build warning

[David Miller]

From: Wolfgang Grandegger <wg@grandegger.com>
Date: Tue, 09 Jun 2009 13:25:27 +0200

> [PATCH] can: sja1000_of_platform: fix build problems with printk format
> 
> Variables of type size_t should be printed with the format "%zx".
> 
> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>

It's not a "size_t", it's a "resource_size_t" which can be
"unsigned long long" on some platforms.

Re: linux-next: net tree build warning

[Wolfgang Grandegger]

Hello,

Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next build (powerpc allyesconfig) produced these warnings:
> 
> drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_probe':
> drivers/net/can/sja1000/sja1000_of_platform.c:111: warning: format '%#x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
> drivers/net/can/sja1000/sja1000_of_platform.c:111: warning: format '%#x' expects type 'unsigned int', but argument 5 has type 'resource_size_t'
> drivers/net/can/sja1000/sja1000_of_platform.c:118: warning: format '%#x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
> drivers/net/can/sja1000/sja1000_of_platform.c:118: warning: format '%#x' expects type 'unsigned int', but argument 5 has type 'resource_size_t'
> 
> Introduced by commit d1a277c584d0862dbf51991baea947ea5f2ce6bf ("can:
> sja1000: generic OF platform bus driver").

The patch below should fix the build problems (which I cannot
reproduce on my test systems).

Thanks,

Wolfgang.

-----------------------------------------------------------------------
[PATCH] can: sja1000_of_platform: fix build problems with printk format

Variables of type size_t should be printed with the format "%zx".

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
---
 drivers/net/can/sja1000/sja1000_of_platform.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c
===================================================================
--- net-next-2.6.orig/drivers/net/can/sja1000/sja1000_of_platform.c	2009-06-09 12:45:38.000000000 +0200
+++ net-next-2.6/drivers/net/can/sja1000/sja1000_of_platform.c	2009-06-09 13:06:56.495718952 +0200
@@ -108,14 +108,14 @@
 	res_size = resource_size(&res);
 
 	if (!request_mem_region(res.start, res_size, DRV_NAME)) {
-		dev_err(&ofdev->dev, "couldn't request %#x..%#x\n",
+		dev_err(&ofdev->dev, "couldn't request %#zx..%#zx\n",
 			res.start, res.end);
 		return -EBUSY;
 	}
 
 	base = ioremap_nocache(res.start, res_size);
 	if (!base) {
-		dev_err(&ofdev->dev, "couldn't ioremap %#x..%#x\n",
+		dev_err(&ofdev->dev, "couldn't ioremap %#zx..%#zx\n",
 			res.start, res.end);
 		err = -ENOMEM;
 		goto exit_release_mem;

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 974 bytes --]

Hi Dave,

Today's linux-next build (powerpc allyesconfig) produced these warnings:

drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp_probe':
drivers/net/can/sja1000/sja1000_of_platform.c:111: warning: format '%#x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
drivers/net/can/sja1000/sja1000_of_platform.c:111: warning: format '%#x' expects type 'unsigned int', but argument 5 has type 'resource_size_t'
drivers/net/can/sja1000/sja1000_of_platform.c:118: warning: format '%#x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
drivers/net/can/sja1000/sja1000_of_platform.c:118: warning: format '%#x' expects type 'unsigned int', but argument 5 has type 'resource_size_t'

Introduced by commit d1a277c584d0862dbf51991baea947ea5f2ce6bf ("can:
sja1000: generic OF platform bus driver").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: net tree build warning

[Neil Horman]

On Fri, May 22, 2009 at 06:20:24PM +1000, Stephen Rothwell wrote:
> Hi Dave,
> 
> On Thu, 21 May 2009 23:30:38 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> >
> > I just pushed the following to fix this:
> > 
> > net: Fix arg to trace_napi_poll() in netpoll.
> 
> Thanks. I remerged the net tree at the end of linux-next today in case
> anyone was doing any testing over the weekend. 
> 
Damnit, thanks for the fixup guys.
Neil

Re: linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

Hi Dave,

On Thu, 21 May 2009 23:30:38 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just pushed the following to fix this:
> 
> net: Fix arg to trace_napi_poll() in netpoll.

Thanks. I remerged the net tree at the end of linux-next today in case
anyone was doing any testing over the weekend. 

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: net tree build warning

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 May 2009 15:16:42 +1000

> Hi Dave,
> 
> Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
> 
> net/core/netpoll.c: In function 'poll_one_napi':
> net/core/netpoll.c:141: warning: passing argument 1 of 'trace_napi_poll' from incompatible pointer type
> include/trace/napi.h:7: note: expected 'struct napi_struct *' but argument is of type 'struct net_device *'
> 
> Introduced by commit 4ea7e38696c7e798c47ebbecadfd392f23f814f9 ("dropmon:
> add ability to detect when hardware dropsrxpackets").

I just pushed the following to fix this:

net: Fix arg to trace_napi_poll() in netpoll.

Reproted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/core/netpoll.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 00b14e2..67b4f3e 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -138,7 +138,7 @@ static int poll_one_napi(struct netpoll_info *npinfo,
 	set_bit(NAPI_STATE_NPSVC, &napi->state);
 
 	work = napi->poll(napi, budget);
-	trace_napi_poll(napi->dev);
+	trace_napi_poll(napi);
 
 	clear_bit(NAPI_STATE_NPSVC, &napi->state);
 	atomic_dec(&trapped);
-- 
1.6.3

linux-next: net tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

Hi Dave,

Today's linux-next build (powerpc ppc64_defconfig) produced this warning:

net/core/netpoll.c: In function 'poll_one_napi':
net/core/netpoll.c:141: warning: passing argument 1 of 'trace_napi_poll' from incompatible pointer type
include/trace/napi.h:7: note: expected 'struct napi_struct *' but argument is of type 'struct net_device *'

Introduced by commit 4ea7e38696c7e798c47ebbecadfd392f23f814f9 ("dropmon:
add ability to detect when hardware dropsrxpackets").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]