linux-next: net tree build failure

linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

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

lib/lib.a(vsprintf.o): In function `pointer':
vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'

Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
from the net tree.

I applied the following fixup patch (and can carry it for a while):
(BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
except where is is selected in Kconfig files.)

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2010 18:37:16 +1100
Subject: [PATCH] net: vsprintf now depends on the byte_rev_table

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 4b78894..e21f9f9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,7 +7,7 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
 endif
 
-lib-y := ctype.o string.o vsprintf.o cmdline.o \
+lib-y := ctype.o string.o vsprintf.o cmdline.o bitrev.o \
 	 rbtree.o radix-tree.o dump_stack.o \
 	 idr.o int_sqrt.o extable.o prio_tree.o \
 	 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
@@ -50,7 +50,6 @@ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
   lib-y += dec_and_lock.o
 endif
 
-obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-$(CONFIG_RATIONAL)	+= rational.o
 obj-$(CONFIG_CRC_CCITT)	+= crc-ccitt.o
 obj-$(CONFIG_CRC16)	+= crc16.o
-- 
1.6.5.7


-- 
Cheers,
Stephen Rothwell                    Stephen@Rothwell.id.au

linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

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

lib/lib.a(vsprintf.o): In function `pointer':
vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'

Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
from the net tree.

I applied the following fixup patch (and can carry it for a while):
(BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
except where is is selected in Kconfig files.)

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2010 18:37:16 +1100
Subject: [PATCH] net: vsprintf now depends on the byte_rev_table

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 4b78894..e21f9f9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,7 +7,7 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
 endif
 
-lib-y := ctype.o string.o vsprintf.o cmdline.o \
+lib-y := ctype.o string.o vsprintf.o cmdline.o bitrev.o \
 	 rbtree.o radix-tree.o dump_stack.o \
 	 idr.o int_sqrt.o extable.o prio_tree.o \
 	 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
@@ -50,7 +50,6 @@ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
   lib-y += dec_and_lock.o
 endif
 
-obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-$(CONFIG_RATIONAL)	+= rational.o
 obj-$(CONFIG_CRC_CCITT)	+= crc-ccitt.o
 obj-$(CONFIG_CRC16)	+= crc16.o
-- 
1.6.5.7


-- 
Cheers,
Stephen Rothwell                    Stephen@Rothwell.id.au

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <Stephen@Rothwell.id.au>
Date: Mon, 11 Jan 2010 18:42:05 +1100

> Hi all,
> 
> Today's linux-next build (powerpc_allnoconfig) failed like this:
> 
> lib/lib.a(vsprintf.o): In function `pointer':
> vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
> vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'
> 
> Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
> ("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
> from the net tree.
> 
> I applied the following fixup patch (and can carry it for a while):
> (BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
> except where is is selected in Kconfig files.)
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 Jan 2010 18:37:16 +1100
> Subject: [PATCH] net: vsprintf now depends on the byte_rev_table
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks I'll apply this and then add a commit which kills
off CONFIG_BITREVERSE.

Thanks!

Re: linux-next: net tree build failure

[Joe Perches]

On Mon, 2010-01-11 at 00:02 -0800, David Miller wrote:
> From: Stephen Rothwell <Stephen@Rothwell.id.au>
> Date: Mon, 11 Jan 2010 18:42:05 +1100
> 
> > Hi all,
> > 
> > Today's linux-next build (powerpc_allnoconfig) failed like this:
> > 
> > lib/lib.a(vsprintf.o): In function `pointer':
> > vsprintf.c:(.text+0x21ba): undefined reference to `byte_rev_table'
> > vsprintf.c:(.text+0x21c2): undefined reference to `byte_rev_table'
> > 
> > Caused by commit bc7259a2ce764ea16200eb9e53f6e136e918d065
> > ("lib/vsprintf.c: Add %pMF to format FDDI bit reversed MAC addresses")
> > from the net tree.
> > 
> > I applied the following fixup patch (and can carry it for a while):
> > (BTW after this patch, CONFIG_BITREVERSE appears to not be used anywhere
> > except where is is selected in Kconfig files.)
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 11 Jan 2010 18:37:16 +1100
> > Subject: [PATCH] net: vsprintf now depends on the byte_rev_table
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> Thanks I'll apply this and then add a commit which kills
> off CONFIG_BITREVERSE.

Perhaps it'd be better to kill off the use of bitrev in
lib/vsprintf as Maciej thinks it broken.

Maybe use something like this?

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index dc48d2b..e83e3e7 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -25,7 +25,6 @@
 #include <linux/kallsyms.h>
 #include <linux/uaccess.h>
 #include <linux/ioport.h>
-#include <linux/bitrev.h>
 #include <net/addrconf.h>
 
 #include <asm/page.h>		/* for PAGE_SIZE */
@@ -682,19 +681,16 @@ static char *mac_address_string(char *buf, char *end, u8 *addr,
 	char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")];
 	char *p = mac_addr;
 	int i;
-	bool bitrev;
 	char separator;
 
 	if (fmt[1] == 'F') {		/* FDDI canonical format */
-		bitrev = true;
 		separator = '-';
 	} else {
-		bitrev = false;
 		separator = ':';
 	}
 
 	for (i = 0; i < 6; i++) {
-		p = pack_hex_byte(p, bitrev ? bitrev8(addr[i]) : addr[i]);
+		p = pack_hex_byte(p, addr[i]);
 		if (fmt[0] == 'M' && i != 5)
 			*p++ = separator;
 	}
@@ -908,9 +904,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr,
  *       usual colon-separated hex notation
  * - 'm' For a 6-byte MAC address, it prints the hex address without colons
  * - 'MF' For a 6-byte MAC FDDI address, it prints the address
- *       with a dash-separated hex notation with bit reversed bytes
- * - 'mF' For a 6-byte MAC FDDI address, it prints the address
- *       in hex notation without separators with bit reversed bytes
+ *       with a dash-separated hex notation
  * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
  *       IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
  *       IPv6 uses colon separated network-order 16 bit hex with leading 0's

Re: linux-next: net tree build failure

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Mon, 11 Jan 2010 00:16:12 -0800

> Perhaps it'd be better to kill off the use of bitrev in
> lib/vsprintf as Maciej thinks it broken.
> 
> Maybe use something like this?
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Yeah that sounds like a better idea, I think I'll commit
this instead.

Thanks Joe!

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave, Joe,

On Mon, 11 Jan 2010 00:44:36 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Joe Perches <joe@perches.com>
> Date: Mon, 11 Jan 2010 00:16:12 -0800
> 
> > Perhaps it'd be better to kill off the use of bitrev in
> > lib/vsprintf as Maciej thinks it broken.
> > 
> > Maybe use something like this?
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> 
> Yeah that sounds like a better idea, I think I'll commit
> this instead.

Thanks guys.

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

[Maciej W. Rozycki]

On Mon, 11 Jan 2010, Joe Perches wrote:

> Perhaps it'd be better to kill off the use of bitrev in
> lib/vsprintf as Maciej thinks it broken.
> 
> Maybe use something like this?

 Thanks for fixing it.

  Maciej

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/qlge/qlge_main.c: In function 'ql_init_device':
drivers/net/qlge/qlge_main.c:4502: error: label 'err_out' used but not defined

Caused by commit 8aae2600030f54494f9061d2cde141802d774be9 ("qlge: Add
basic firmware dump") interacting with commit
4f9a91c81273b66afe0b6a9be460b47581b28246 ("qlge: Only free resources if
they were allocated") from Linus' tree.

I applied the following merge fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Jan 2010 13:10:17 +1100
Subject: [PATCH] net: merge fixup for qlge_main

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/qlge/qlge_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4adca94..5be3ae2 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4499,7 +4499,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
 		if (qdev->mpi_coredump == NULL) {
 			dev_err(&pdev->dev, "Coredump alloc failed.\n");
 			err = -ENOMEM;
-			goto err_out;
+			goto err_out2;
 		}
 		if (qlge_force_coredump)
 			set_bit(QL_FRC_COREDUMP, &qdev->flags);
-- 
1.6.6

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Jan 2010 13:18:27 +1100

> Hi Dave,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/net/qlge/qlge_main.c: In function 'ql_init_device':
> drivers/net/qlge/qlge_main.c:4502: error: label 'err_out' used but not defined
> 
> Caused by commit 8aae2600030f54494f9061d2cde141802d774be9 ("qlge: Add
> basic firmware dump") interacting with commit
> 4f9a91c81273b66afe0b6a9be460b47581b28246 ("qlge: Only free resources if
> they were allocated") from Linus' tree.
> 
> I applied the following merge fixup.

Thanks for letting me know, I'll do a merge and make sure this
gets cured just how you fixed it.

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

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

drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_prepare_tso':
drivers/net/vmxnet3/vmxnet3_drv.c:826: error: implicit declaration of function 'csum_ipv6_magic'

Revealed by commit 115924b6bdc7cc6bf7da5b933b09281e1f4e17a9 ("net:
Getting rid of the x86 dependency to built vmxnet3") which allowed this
driver to be built on PowerPC at all.

I applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Nov 2009 16:46:43 +1100
Subject: [PATCH] net: using csum_ipv6_magic requires including net/ip6_checksum.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/vmxnet3/vmxnet3_drv.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 8f24fe5..a4c97e7 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -24,6 +24,8 @@
  *
  */
 
+#include <net/ip6_checksum.h>
+
 #include "vmxnet3_int.h"
 
 char vmxnet3_driver_name[] = "vmxnet3";
-- 
1.6.5.2

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

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Nov 2009 16:51:45 +1100

> drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_prepare_tso':
> drivers/net/vmxnet3/vmxnet3_drv.c:826: error: implicit declaration of function 'csum_ipv6_magic'
> 
> Revealed by commit 115924b6bdc7cc6bf7da5b933b09281e1f4e17a9 ("net:
> Getting rid of the x86 dependency to built vmxnet3") which allowed this
> driver to be built on PowerPC at all.

Enabling on more platforms helps find problems like this :-)

> Subject: [PATCH] net: using csum_ipv6_magic requires including net/ip6_checksum.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks!

RE: linux-next: net tree build failure

[Shreyas Bhatewara]

________________________________________
From: David Miller [davem@davemloft.net]
Sent: Tuesday, November 17, 2009 11:05 PM
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Shreyas Bhatewara
Subject: Re: linux-next: net tree build failure

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Nov 2009 16:51:45 +1100

> drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_prepare_tso':
> drivers/net/vmxnet3/vmxnet3_drv.c:826: error: implicit declaration of function 'csum_ipv6_magic'
>
> Revealed by commit 115924b6bdc7cc6bf7da5b933b09281e1f4e17a9 ("net:
> Getting rid of the x86 dependency to built vmxnet3") which allowed this
> driver to be built on PowerPC at all.

Enabling on more platforms helps find problems like this :-)

> Subject: [PATCH] net: using csum_ipv6_magic requires including net/ip6_checksum.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks!




Thanks Stephen,

I cross-compiled the patched kernel for sparc. Didn't do it for PowerPC :(

->Shreyas

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (alpha defconfig) failed like this:

arch/alpha/kernel/systbls.S:507: Error: .err encountered

Caused by commit a2e2725541fad72416326798c2d7fa4dafb7d337 ("net:
Introduce recvmmsg socket syscall") which added a syscall to the alpha
syscall table but forgot to update NR_SYSCALLS in
arch/alpha/include/asm/unistd.h (it also didn't add the __NR_ constant
thee either).

I suspect that this is true for a few other architectures as well
(including sparc?).
-- 
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 failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (alpha defconfig) failed like this:

arch/alpha/kernel/systbls.S:507: Error: .err encountered

Caused by commit a2e2725541fad72416326798c2d7fa4dafb7d337 ("net:
Introduce recvmmsg socket syscall") which added a syscall to the alpha
syscall table but forgot to update NR_SYSCALLS in
arch/alpha/include/asm/unistd.h (it also didn't add the __NR_ constant
thee either).

I suspect that this is true for a few other architectures as well
(including sparc?).
-- 
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 failure

[Arnaldo Carvalho de Melo]

Em Sat, Nov 14, 2009 at 05:50:41PM +1100, Stephen Rothwell escreveu:
> Hi Dave,
> 
> Today's linux-next build (alpha defconfig) failed like this:
> 
> arch/alpha/kernel/systbls.S:507: Error: .err encountered
> 
> Caused by commit a2e2725541fad72416326798c2d7fa4dafb7d337 ("net:
> Introduce recvmmsg socket syscall") which added a syscall to the alpha
> syscall table but forgot to update NR_SYSCALLS in
> arch/alpha/include/asm/unistd.h (it also didn't add the __NR_ constant
> thee either).
> 
> I suspect that this is true for a few other architectures as well
> (including sparc?).

I'm trying to get hold of a cross compiler setup now...

- Arnaldo

linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

net/appletalk/ddp.c: In function 'atalk_compat_ioctl':
net/appletalk/ddp.c:1866: error: implicit declaration of function 'compat_ptr'

Caused by commit 206602217747382488fcae68351673cc9103debc
("appletalk: handle SIOCATALKDIFADDR compat ioctl").

I applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 13:11:26 +1100
Subject: [PATCH] net/appletalk: using compat_ptr needs inclusion of linux/compat.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/appletalk/ddp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index b631cc7..73ca4d5 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -56,6 +56,7 @@
 #include <linux/if_arp.h>
 #include <linux/smp_lock.h>
 #include <linux/termios.h>	/* For TIOCOUTQ/INQ */
+#include <linux/compat.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <net/sock.h>
-- 
1.6.5.2


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

linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

net/appletalk/ddp.c: In function 'atalk_compat_ioctl':
net/appletalk/ddp.c:1866: error: implicit declaration of function 'compat_ptr'

Caused by commit 206602217747382488fcae68351673cc9103debc
("appletalk: handle SIOCATALKDIFADDR compat ioctl").

I applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 13:11:26 +1100
Subject: [PATCH] net/appletalk: using compat_ptr needs inclusion of linux/compat.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/appletalk/ddp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index b631cc7..73ca4d5 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -56,6 +56,7 @@
 #include <linux/if_arp.h>
 #include <linux/smp_lock.h>
 #include <linux/termios.h>	/* For TIOCOUTQ/INQ */
+#include <linux/compat.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <net/sock.h>
-- 
1.6.5.2


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

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 13:21:51 +1100

> Subject: [PATCH] net/appletalk: using compat_ptr needs inclusion of linux/compat.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

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

drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
drivers/net/cnic.c:1757: error: implicit declaration of functi
on 'csum_ipv6_magic'

Caused by commit 71034ba845c9ff219373066f904286c0b7506922 ("cnic: Add
main functions to support bnx2x devices") which I have reverted for today.

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

[Michael Chan]

Stephen Rothwell wrote:

> Hi Dave,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
> drivers/net/cnic.c:1757: error: implicit declaration of functi
> on 'csum_ipv6_magic'
>
> Caused by commit 71034ba845c9ff219373066f904286c0b7506922 ("cnic: Add
> main functions to support bnx2x devices") which I have
> reverted for today.
>

I think adding #include <net/ip6_checksum.h> will work.  Will send a
patch right away.  Thanks.

Re: linux-next: net tree build failure

[David Miller]

From: "Michael Chan" <mchan@broadcom.com>
Date: Mon, 12 Oct 2009 22:14:22 -0700

> I think adding #include <net/ip6_checksum.h> will work.  Will send a
> patch right away.  Thanks.

Too slow, I already fixed this :-)

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Oct 2009 15:33:08 +1100

> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
> drivers/net/cnic.c:1757: error: implicit declaration of functi
> on 'csum_ipv6_magic'
> 
> Caused by commit 71034ba845c9ff219373066f904286c0b7506922 ("cnic: Add
> main functions to support bnx2x devices") which I have reverted for today.

It's because x86 and sparc64 seem to get the ipv6 checksum header
implicitly somehow.

I'll fix this as follows, thanks for the report Stephen:

cnic: Need to include net/ip6_checksum.h

drivers/net/cnic.c: In function 'cnic_init_storm_conn_bufs':
drivers/net/cnic.c:1757: error: implicit declaration of function 'csum_ipv6_magic'

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/cnic.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 6e7af7b..333b1d1 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -33,6 +33,7 @@
 #include <net/route.h>
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
 #include <scsi/iscsi_if.h>
 
 #include "cnic_if.h"
-- 
1.6.4.4

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (m68k defconfig) failed like this:

drivers/net/sonic.c: In function 'sonic_send_packet':
drivers/net/sonic.c:227: error: expected ';' before '}' token

Caused by commit 5b548140225c6bbbbd560551dd1048b2c0ce58be ("net: use
symbolic values for ndo_start_xmit() return codes") which lost a
semicolon in drivers/net/sonic.c.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Jun 2009 16:31:12 +1000

> Today's linux-next build (m68k defconfig) failed like this:
> 
> drivers/net/sonic.c: In function 'sonic_send_packet':
> drivers/net/sonic.c:227: error: expected ';' before '}' token
> 
> Caused by commit 5b548140225c6bbbbd560551dd1048b2c0ce58be ("net: use
> symbolic values for ndo_start_xmit() return codes") which lost a
> semicolon in drivers/net/sonic.c.

I just pushed the following fix, thanks!

sonic: Fix build after ndo_start_xmit() changes.

Noticed by Stephen Rothwell.

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

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index e4255d8..753a1fb 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -223,7 +223,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
 	if (!laddr) {
 		printk(KERN_ERR "%s: failed to map tx DMA buffer.\n", dev->name);
 		dev_kfree_skb(skb);
-		return NETDEV_TX_BUSY
+		return NETDEV_TX_BUSY;
 	}
 
 	sonic_tda_put(dev, entry, SONIC_TD_STATUS, 0);       /* clear status */
-- 
1.6.3.2

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Wed, 17 Jun 2009 01:36:58 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just pushed the following fix, thanks!
> 
> sonic: Fix build after ndo_start_xmit() changes.

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 failure

[Eric W. Biederman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Dave,
>
> Today's linux-next build of at least some av32 and arm configs failed like this:
>
> arch/avr32/kernel/signal.c:216: error: conflicting types for 'restart_syscall'
> include/linux/sched.h:2184: error: previous definition of 'restart_syscall' was here
>
> Caused by commit 690cc3ffe33ac4a2857583c22d4c6244ae11684d ("syscall:
> Implement a convinience function restart_syscall") from the net tree.
>
> grep is your friend ...

Grrr. Some days it feels like all of the good names are already taken.

How does this look for a solution to the name clash?


---

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 80b8b5c..88a8f0b 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -532,7 +532,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
 	return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
 	regs->ARM_r0 = regs->ARM_ORIG_r0;
 	regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
@@ -567,7 +567,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
 			}
 			/* fallthrough */
 		case -ERESTARTNOINTR:
-			restart_syscall(regs);
+			setup_syscall_restart(regs);
 		}
 	}
 
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 803d7be..2722756 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -212,7 +212,7 @@ out:
 	return err;
 }
 
-static inline void restart_syscall(struct pt_regs *regs)
+static inline void setup_syscall_restart(struct pt_regs *regs)
 {
 	if (regs->r12 == -ERESTART_RESTARTBLOCK)
 		regs->r8 = __NR_restart_syscall;
@@ -296,7 +296,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)
 			}
 			/* fall through */
 		case -ERESTARTNOINTR:
-			restart_syscall(regs);
+			setup_syscall_restart(regs);
 		}
 	}

Re: linux-next: net tree build failure

[David Miller]

From: ebiederm@xmission.com (Eric W. Biederman)
Date: Wed, 20 May 2009 07:53:21 -0700

> Grrr. Some days it feels like all of the good names are already taken.
> 
> How does this look for a solution to the name clash?

Give me a signoff so I can apply this Eric, thanks.

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (m68k defconfig) failed like this:

drivers/net/8390p.c:94:19: error: invalid suffix "p_init_module" on integer constant
drivers/net/8390p.c:94: error: expected identifier or '(' before numeric constant
drivers/net/8390p.c:99:20: error: invalid suffix "p_cleanup_module" on integer constant
drivers/net/8390p.c:99: error: expected identifier or '(' before numeric constant
drivers/net/8390p.c:103:30: error: invalid suffix "p_init_module" on integer constant
drivers/net/8390p.c:104:33: error: invalid suffix "p_cleanup_module" on integer constant

Caused by commit 362b76edb78923face033e18e4ffc85df8db0f28 ("8390p: Get
rid of init_module/cleanup_module").

Clearly not even looked at hard, much less built ...

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Apr 2009 17:01:36 +1000

> Caused by commit 362b76edb78923face033e18e4ffc85df8db0f28 ("8390p: Get
> rid of init_module/cleanup_module").
> 
> Clearly not even looked at hard, much less built ...

Yes I certainly regret applying that garbage patch.

And I do mean GARBAGE.

Alexander fixed it up and I pushed the fix onto kernel.org

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Fri, 24 Apr 2009 04:53:14 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Alexander fixed it up and I pushed the fix onto kernel.org

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

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Building next-20090421 (arm assabet_defconfig and several others) fails like
this:

drivers/net/irda/sa1100_ir.c:928: error: 'struct net_device' has no member named 'ir'

Caused by commit a1de966682551debbe690672e760487cc555c05f
("irda/sa1100_ir: convert to net_device_ops").

A simple typo - more care needed ...
-- 
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 failure

[Alexander Beregalov]

On Wed, Apr 22, 2009 at 10:29:06AM +1000, Stephen Rothwell wrote:
> Hi Dave,
> 
> Building next-20090421 (arm assabet_defconfig and several others) fails like
> this:
> 
> drivers/net/irda/sa1100_ir.c:928: error: 'struct net_device' has no member named 'ir'
> 
> Caused by commit a1de966682551debbe690672e760487cc555c05f
> ("irda/sa1100_ir: convert to net_device_ops").
> 
> A simple typo - more care needed ...

Yes, my bad. Thanks!

>From 53312aaa78cfbb3db6fc6062de67e3a47e773270 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 22 Apr 2009 04:34:47 +0400
Subject: [PATCH] sa1100_ir: fix build breakage

Fix simple typo. Caused by commit
a1de966682551debbe690672e760487cc555c05f
("irda/sa1100_ir: convert to net_device_ops").

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/net/irda/sa1100_ir.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 4ed7636..2aeb2e6 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -925,7 +925,7 @@ static int sa1100_irda_probe(struct platform_device *pdev)
 		goto err_mem_5;
 
 	dev->netdev_ops	= &sa1100_irda_netdev_ops;
-	dev->ir		= IRQ_Ser2ICP;
+	dev->irq	= IRQ_Ser2ICP;
 
 	irda_init_max_qos_capabilies(&si->qos);
 
-- 
1.6.2.3

Re: linux-next: net tree build failure

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 22 Apr 2009 04:37:59 +0400

> sa1100_ir: fix build breakage
> 
> Fix simple typo. Caused by commit
> a1de966682551debbe690672e760487cc555c05f
> ("irda/sa1100_ir: convert to net_device_ops").
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Applied.

This is the second build failure you introduced in the past
week Alexander, you need to be more careful.

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

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

drivers/net/iseries_veth.c: In function 'veth_probe_one':
drivers/net/iseries_veth.c:1080: error: 'struct net_device' has no member named 'netdev'

Caused by commit c2775360e82760be3ad7339a7a1442c45c35b395 ("iseries_veth:
convert to net_device_ops").

I have used the net tree from next-20090417 for today.
-- 
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 failure

[Alexander Beregalov]

On Mon, Apr 20, 2009 at 11:26:29AM +1000, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/net/iseries_veth.c: In function 'veth_probe_one':
> drivers/net/iseries_veth.c:1080: error: 'struct net_device' has no member named 'netdev'
> 
> Caused by commit c2775360e82760be3ad7339a7a1442c45c35b395 ("iseries_veth:
> convert to net_device_ops").
> 
> I have used the net tree from next-20090417 for today.

Thanks and sorry.

>From bb142d6f89c99892156bb104a6f0d6f7392bf8b7 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Mon, 20 Apr 2009 05:33:04 +0400
Subject: [PATCH] iseries_veth: fix build breakage


Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/net/iseries_veth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 264654d..e44215c 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1077,7 +1077,7 @@ static struct net_device *veth_probe_one(int vlan,
 
 	memcpy(&port->mac_addr, mac_addr, ETH_ALEN);
 
-	dev->netdev = &veth_netdev_ops;
+	dev->netdev_ops = &veth_netdev_ops;
 	SET_ETHTOOL_OPS(dev, &ops);
 
 	SET_NETDEV_DEV(dev, vdev);
-- 
1.6.2.3

Re: linux-next: net tree build failure

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Mon, 20 Apr 2009 05:36:20 +0400

> iseries_veth: fix build breakage
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Applied and pushed out to net-next-2.6, thanks!

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

On Sun, 19 Apr 2009 18:43:36 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Alexander Beregalov <a.beregalov@gmail.com>
> Date: Mon, 20 Apr 2009 05:36:20 +0400
> 
> > iseries_veth: fix build breakage
> > 
> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> 
> Applied and pushed out to net-next-2.6, thanks!

I'll pick it up tomorrow, 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 --]

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

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

In file included from net/core/skbuff.c:69:
include/trace/skb.h:4: error: expected ')' before '(' token
include/trace/skb.h:4: error: expected ')' before '(' token
include/trace/skb.h:4: warning: function declaration isn't a prototype
include/trace/skb.h: In function 'register_trace_kfree_skb':
include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
include/trace/skb.h:4: error: (Each undeclared identifier is reported only once
include/trace/skb.h:4: error: for each function it appears in.)
include/trace/skb.h: At top level:
include/trace/skb.h:4: error: expected ')' before '(' token
include/trace/skb.h:4: warning: function declaration isn't a prototype
include/trace/skb.h: In function 'unregister_trace_kfree_skb':
include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
net/core/skbuff.c: In function 'kfree_skb':
net/core/skbuff.c:446: error: implicit declaration of function 'trace_kfree_skb'

Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing:
replace TP<var> with TP_<var>") from the tracing tree interacting with
commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor:
Add trace declaration for skb frees") from the net tree.

I added the merge fixup below and can carry it as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/


diff --git a/include/trace/skb.h b/include/trace/skb.h
index 3aa8646..d9679c2 100644
--- a/include/trace/skb.h
+++ b/include/trace/skb.h
@@ -2,7 +2,7 @@
 #define _TRACE_SKB_H_
 
 DECLARE_TRACE(kfree_skb,
-	TPPROTO(struct sk_buff *skb, void *location),
-	TPARGS(skb, location));
+	TP_PROTO(struct sk_buff *skb, void *location),
+	TP_ARGS(skb, location));
 
 #endif
-- 
1.6.2.1

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Mar 2009 15:46:17 +1100

> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> In file included from net/core/skbuff.c:69:
> include/trace/skb.h:4: error: expected ')' before '(' token
> include/trace/skb.h:4: error: expected ')' before '(' token
> include/trace/skb.h:4: warning: function declaration isn't a prototype
> include/trace/skb.h: In function 'register_trace_kfree_skb':
> include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
> include/trace/skb.h:4: error: (Each undeclared identifier is reported only once
> include/trace/skb.h:4: error: for each function it appears in.)
> include/trace/skb.h: At top level:
> include/trace/skb.h:4: error: expected ')' before '(' token
> include/trace/skb.h:4: warning: function declaration isn't a prototype
> include/trace/skb.h: In function 'unregister_trace_kfree_skb':
> include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
> net/core/skbuff.c: In function 'kfree_skb':
> net/core/skbuff.c:446: error: implicit declaration of function 'trace_kfree_skb'
> 
> Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing:
> replace TP<var> with TP_<var>") from the tracing tree interacting with
> commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor:
> Add trace declaration for skb frees") from the net tree.
> 
> I added the merge fixup below and can carry it as necessary.

I think you're going to have to carry this one indefinitely.
At least until that tracing tree change goes upstream.

Re: linux-next: net tree build failure

[Ingo Molnar]

* David Miller <davem@davemloft.net> wrote:

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 19 Mar 2009 15:46:17 +1100
> 
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > In file included from net/core/skbuff.c:69:
> > include/trace/skb.h:4: error: expected ')' before '(' token
> > include/trace/skb.h:4: error: expected ')' before '(' token
> > include/trace/skb.h:4: warning: function declaration isn't a prototype
> > include/trace/skb.h: In function 'register_trace_kfree_skb':
> > include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
> > include/trace/skb.h:4: error: (Each undeclared identifier is reported only once
> > include/trace/skb.h:4: error: for each function it appears in.)
> > include/trace/skb.h: At top level:
> > include/trace/skb.h:4: error: expected ')' before '(' token
> > include/trace/skb.h:4: warning: function declaration isn't a prototype
> > include/trace/skb.h: In function 'unregister_trace_kfree_skb':
> > include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
> > net/core/skbuff.c: In function 'kfree_skb':
> > net/core/skbuff.c:446: error: implicit declaration of function 'trace_kfree_skb'
> > 
> > Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing:
> > replace TP<var> with TP_<var>") from the tracing tree interacting with
> > commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor:
> > Add trace declaration for skb frees") from the net tree.
> > 
> > I added the merge fixup below and can carry it as necessary.
> 
> I think you're going to have to carry this one indefinitely. At 
> least until that tracing tree change goes upstream.

i'll take this as an implicit:

  Acked-by: David S. Miller <davem@davemloft.net>

Okay?

	Ingo

Re: linux-next: net tree build failure

[David Miller]

From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 1 Apr 2009 21:58:08 +0200

> 
> * David Miller <davem@davemloft.net> wrote:
> 
> > I think you're going to have to carry this one indefinitely. At 
> > least until that tracing tree change goes upstream.
> 
> i'll take this as an implicit:
> 
>   Acked-by: David S. Miller <davem@davemloft.net>
> 
> Okay?

Yep.

Re: linux-next: net tree build failure

[Stephen Rothwell]

Hi all,

On Thu, 19 Mar 2009 15:46:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> In file included from net/core/skbuff.c:69:
> include/trace/skb.h:4: error: expected ')' before '(' token
> include/trace/skb.h:4: error: expected ')' before '(' token
> include/trace/skb.h:4: warning: function declaration isn't a prototype
> include/trace/skb.h: In function 'register_trace_kfree_skb':
> include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
> include/trace/skb.h:4: error: (Each undeclared identifier is reported only once
> include/trace/skb.h:4: error: for each function it appears in.)
> include/trace/skb.h: At top level:
> include/trace/skb.h:4: error: expected ')' before '(' token
> include/trace/skb.h:4: warning: function declaration isn't a prototype
> include/trace/skb.h: In function 'unregister_trace_kfree_skb':
> include/trace/skb.h:4: error: 'probe' undeclared (first use in this function)
> net/core/skbuff.c: In function 'kfree_skb':
> net/core/skbuff.c:446: error: implicit declaration of function 'trace_kfree_skb'
> 
> Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing:
> replace TP<var> with TP_<var>") from the tracing tree interacting with
> commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor:
> Add trace declaration for skb frees") from the net tree.
> 
> I added the merge fixup below and can carry it as necessary.

This patch should now be applicable to the tracing tree.

diff --git a/include/trace/skb.h b/include/trace/skb.h
index 3aa8646..d9679c2 100644
--- a/include/trace/skb.h
+++ b/include/trace/skb.h
@@ -2,7 +2,7 @@
 #define _TRACE_SKB_H_
 
 DECLARE_TRACE(kfree_skb,
-	TPPROTO(struct sk_buff *skb, void *location),
-	TPARGS(skb, location));
+	TP_PROTO(struct sk_buff *skb, void *location),
+	TP_ARGS(skb, location));
 
 #endif
-- 
1.6.2.1


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

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

On Mon, 30 Mar 2009 12:15:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> This patch should now be applicable to the tracing tree.

After merging with Linus' tree, of course.

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

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

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

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

net/rds/cong.c: In function 'rds_cong_set_bit':
net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
net/rds/cong.c: In function 'rds_cong_clear_bit':
net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
net/rds/cong.c: In function 'rds_cong_test_bit':
net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'

Caused by commit 922cb17a5c812fcc9ebee249f4109db099896941 ("RDS:
Congestion-handling code").

I have reverted that commit and commit
fe17f84f5f2a7d6c1a31c04c06a016d4ad5f7dec ("RDS: Kconfig and Makefile")
that makes it all build.
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Mar 2009 18:05:14 +1100

> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> net/rds/cong.c: In function 'rds_cong_set_bit':
> net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
> net/rds/cong.c: In function 'rds_cong_clear_bit':
> net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
> net/rds/cong.c: In function 'rds_cong_test_bit':
> net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'

I've fixed this up as follows:

rds: Fix build on powerpc.

As reported by Stephen Rothwell.

> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> net/rds/cong.c: In function 'rds_cong_set_bit':
> net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
> net/rds/cong.c: In function 'rds_cong_clear_bit':
> net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
> net/rds/cong.c: In function 'rds_cong_test_bit':
> net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'

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

diff --git a/net/rds/cong.c b/net/rds/cong.c
index 90e6b31..710e459 100644
--- a/net/rds/cong.c
+++ b/net/rds/cong.c
@@ -33,6 +33,8 @@
 #include <linux/types.h>
 #include <linux/rbtree.h>
 
+#include <asm-generic/bitops/le.h>
+
 #include "rds.h"
 
 /*
-- 
1.6.1.2.253.ga34a

Re: linux-next: net tree build failure

[Andy Grover]

David Miller wrote:
> I've fixed this up as follows:
> 
> rds: Fix build on powerpc.

> +#include <asm-generic/bitops/le.h>

Thanks.

Regards -- Andy

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Mon, 02 Mar 2009 01:49:58 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Mar 2009 18:05:14 +1100
> 
> > Today's linux-next build (powerpc allyesconfig) failed like this:
> > 
> > net/rds/cong.c: In function 'rds_cong_set_bit':
> > net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
> > net/rds/cong.c: In function 'rds_cong_clear_bit':
> > net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
> > net/rds/cong.c: In function 'rds_cong_test_bit':
> > net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'
> 
> I've fixed this up as follows:

I was actually wondering if this was some API that powerpc had not
implemented (most other architectures include asm-generic/bitops/le.h in
their asm/bitops.h via asm-generic/bitops/ext2-non-atomic.h or
asm-generic/bitops/minix-le.h) or whether RDS should be using some other
API (since this is the first use of those functions outside the headers
above).

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: net tree build failure

[Andy Grover]

Stephen Rothwell wrote:
> Hi Dave,
> 
> On Mon, 02 Mar 2009 01:49:58 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 2 Mar 2009 18:05:14 +1100
>>
>>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>>
>>> net/rds/cong.c: In function 'rds_cong_set_bit':
>>> net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
>>> net/rds/cong.c: In function 'rds_cong_clear_bit':
>>> net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
>>> net/rds/cong.c: In function 'rds_cong_test_bit':
>>> net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'
>> I've fixed this up as follows:
> 
> I was actually wondering if this was some API that powerpc had not
> implemented (most other architectures include asm-generic/bitops/le.h in
> their asm/bitops.h via asm-generic/bitops/ext2-non-atomic.h or
> asm-generic/bitops/minix-le.h) or whether RDS should be using some other
> API (since this is the first use of those functions outside the headers
> above).

My 2c,

I think the correct solution is for all archs to define 
generic_*_le_bit. In addition ext2_*_bit callers (there are a bunch 
besides ext2!) should be fixed.

Some examples:

include/linux/reiserfs_fs.h:#define reiserfs_test_and_set_le_bit 
ext2_set_bit
fs/udf/balloc.c:#define udf_clear_bit(nr, addr) ext2_clear_bit(nr, addr)
fs/ext4/ext4.h:#define ext4_set_bit                     ext2_set_bit

And this one:

lib/find_next_bit.c:static inline unsigned long ext2_swabp(const 
unsigned long *

^^^ cargo cult ext2 prefixing???

Regards -- Andy

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "com20020_netdev_ops" [drivers/net/arcnet/com20020-pci.ko] undefined!

We are not winning with this one :-(

Again caused by commit a1799af4d7deefccdaa9d222a886fa1373dbb49a
("com20020: convert to net_devic_ops") which needed to export the
com20020_netdev_ops to modules.

I have reverted that commit (and 0db155de988031f925096a7df1bf9633790a2c18
"com20020: Fix allyesconfig build failure" which depends on it).
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Jan 2009 13:53:07 +1100

> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "com20020_netdev_ops" [drivers/net/arcnet/com20020-pci.ko] undefined!
> 
> We are not winning with this one :-(

I don't understand this.  If I mark it extern, as I did, it
should only be defined in one object file.

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

On Sun, 25 Jan 2009 20:46:23 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 26 Jan 2009 13:53:07 +1100
> 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > ERROR: "com20020_netdev_ops" [drivers/net/arcnet/com20020-pci.ko] undefined!
> > 
> > We are not winning with this one :-(
> 
> I don't understand this.  If I mark it extern, as I did, it
> should only be defined in one object file.

It needs an EXPORT_SYMBOL() where it is defined (in com20020.c).

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Jan 2009 16:15:23 +1100

> On Sun, 25 Jan 2009 20:46:23 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 26 Jan 2009 13:53:07 +1100
> > 
> > > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > > 
> > > ERROR: "com20020_netdev_ops" [drivers/net/arcnet/com20020-pci.ko] undefined!
> > > 
> > > We are not winning with this one :-(
> > 
> > I don't understand this.  If I mark it extern, as I did, it
> > should only be defined in one object file.
> 
> It needs an EXPORT_SYMBOL() where it is defined (in com20020.c).

Ahh, I see.  Can you possibly give this a try before I
push it out?

com0020: Add missing symbol export for com20020_netdev_ops.

Thanks to Stephen Rothwell.

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

diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index bbe8f2c..651275a 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -348,6 +348,7 @@ static void com20020_set_mc_list(struct net_device *dev)
     defined(CONFIG_ARCNET_COM20020_CS_MODULE)
 EXPORT_SYMBOL(com20020_check);
 EXPORT_SYMBOL(com20020_found);
+EXPORT_SYMBOL(com20020_netdev_ops);
 #endif
 
 MODULE_LICENSE("GPL");
-- 
1.6.1.15.g159c88

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Sun, 25 Jan 2009 21:17:55 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Ahh, I see.  Can you possibly give this a try before I
> push it out?

My x86_64 allmodconfig now builds (with the two net commits restored and
your patch applied).

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Jan 2009 19:31:26 +1100

> Hi Dave,
> 
> On Sun, 25 Jan 2009 21:17:55 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > Ahh, I see.  Can you possibly give this a try before I
> > push it out?
> 
> My x86_64 allmodconfig now builds (with the two net commits restored and
> your patch applied).

Thanks so much for testing.

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

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

drivers/net/arcnet/com20020-pci.o:(.bss+0x10): multiple definition of `com20020_netdev_ops'
drivers/net/arcnet/com20020.o:(.data.rel.ro+0x0): first defined here

The immediate cause is commit a1799af4d7deefccdaa9d222a886fa1373dbb49a
("com20020: convert to net_devic_ops") which I have reverted for today.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Jan 2009 18:28:47 +1100

> drivers/net/arcnet/com20020-pci.o:(.bss+0x10): multiple definition of `com20020_netdev_ops'
> drivers/net/arcnet/com20020.o:(.data.rel.ro+0x0): first defined here
> 
> The immediate cause is commit a1799af4d7deefccdaa9d222a886fa1373dbb49a
> ("com20020: convert to net_devic_ops") which I have reverted for today.

Does this patch fix it? I can't see any other way to end up
with a multiple definition like that.

diff --git a/include/linux/com20020.h b/include/linux/com20020.h
index 350afa7..5dcfb94 100644
--- a/include/linux/com20020.h
+++ b/include/linux/com20020.h
@@ -29,7 +29,7 @@
 
 int com20020_check(struct net_device *dev);
 int com20020_found(struct net_device *dev, int shared);
-const struct net_device_ops com20020_netdev_ops;
+extern const struct net_device_ops com20020_netdev_ops;
 
 /* The number of low I/O ports used by the card. */
 #define ARCNET_TOTAL_SIZE 8

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Thu, 22 Jan 2009 23:56:12 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Does this patch fix it? I can't see any other way to end up
> with a multiple definition like that.

It confused me as well (one of the defintions is in the bss and one in
ro-data).  I will give your patch a try later tonight.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Jan 2009 19:01:03 +1100

> On Thu, 22 Jan 2009 23:56:12 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > Does this patch fix it? I can't see any other way to end up
> > with a multiple definition like that.
> 
> It confused me as well (one of the defintions is in the bss and one in
> ro-data).  I will give your patch a try later tonight.

Ok, if one was in the BSS then very likely my patch will fix
things.

Look forward to your test results :)

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Fri, 23 Jan 2009 00:13:37 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Ok, if one was in the BSS then very likely my patch will fix
> things.
> 
> Look forward to your test results :)
> 

I did some builds just using Debian Sid's native x86 gcc and binutils:

$ gcc --version
gcc (Debian 4.3.2-4) 4.3.3 20090119 (prerelease)
Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

$ as --version
GNU assembler (GNU Binutils for Debian) 2.18.0.20080103
Copyright 2007 Free Software Foundation, Inc.
This program is free software; you may redistribute it under the terms of
the GNU General Public License version 3 or later.
This program has absolutely no warranty.
This assembler was configured for a target of `i486-linux-gnu'.

Without your patch:

$ objdump -t com20020*.o | grep _ops
0000000000000000 g     O .bss	00000000000000a8 com20020_netdev_ops
0000000000000000 g     O .rodata	00000000000000a8 com20020_netdev_ops

So it is not powerpc specific.  (The powerpc toolchain (gcc 4.3.2m
binutils 2.19) was built by me from gnu sources, so it is not Debian
specific either.)

With your patch:

$ objdump -t com20020*.o | grep _ops
0000000000000000         *UND*	0000000000000000 com20020_netdev_ops
0000000000000000 g     O .rodata	00000000000000a8 com20020_netdev_ops

So, this could be a compiler bug?
-- 
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 failure

[Stephen Rothwell]

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

Hi again,

On Fri, 23 Jan 2009 21:21:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> So, this could be a compiler bug?

We pass -fno-common to gcc which seems to cause the (non-extern) const
variable to end up in the bss.

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

[Stephen Rothwell]

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

On Fri, 23 Jan 2009 21:39:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi again,
> 
> On Fri, 23 Jan 2009 21:21:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > So, this could be a compiler bug?
> 
> We pass -fno-common to gcc which seems to cause the (non-extern) const
> variable to end up in the bss.

       -fno-common
           In C, allocate even uninitialized global variables in the data
           section of the object file, rather than generating them as common
           blocks.  This has the effect that if the same variable is declared
           (without "extern") in two different compilations, you will get an
           error when you link them.  The only reason this might be useful is
           if you wish to verify that the program will work on other systems
           which always work this way.

I don't know why we use this, but it seems to basically make using
"extern" on variables in header files compulsory.  But it seems to be
moving the variable from *COM* to .bss rather than to .{ro}data as I would
expect from the description above.

Oh, well, easy to work around.
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Jan 2009 21:50:57 +1100

> On Fri, 23 Jan 2009 21:39:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi again,
> > 
> > On Fri, 23 Jan 2009 21:21:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > So, this could be a compiler bug?
> > 
> > We pass -fno-common to gcc which seems to cause the (non-extern) const
> > variable to end up in the bss.
> 
>        -fno-common
>            In C, allocate even uninitialized global variables in the data
>            section of the object file, rather than generating them as common
>            blocks.  This has the effect that if the same variable is declared
>            (without "extern") in two different compilations, you will get an
>            error when you link them.  The only reason this might be useful is
>            if you wish to verify that the program will work on other systems
>            which always work this way.
> 
> I don't know why we use this, but it seems to basically make using
> "extern" on variables in header files compulsory.  But it seems to be
> moving the variable from *COM* to .bss rather than to .{ro}data as I would
> expect from the description above.
> 
> Oh, well, easy to work around.

Thanks for testing, it confirms my suspicions :-)

I'll check in the fix.

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

The linux-next build (arm xm_x2xx_defconfig) fails like this:

net/bluetooth/rfcomm/sock.c: In function 'rfcomm_sock_ioctl':
net/bluetooth/rfcomm/sock.c:795: error: 'sk' undeclared (first use in this function)

Introduced (I think) by commit a418b893a6af11ae73c762ed5b76c1bad6dc19d8
("Bluetooth: Enable per-module dynamic debug messages").
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Dec 2008 17:29:54 +1100

> The linux-next build (arm xm_x2xx_defconfig) fails like this:
> 
> net/bluetooth/rfcomm/sock.c: In function 'rfcomm_sock_ioctl':
> net/bluetooth/rfcomm/sock.c:795: error: 'sk' undeclared (first use in this function)
> 
> Introduced (I think) by commit a418b893a6af11ae73c762ed5b76c1bad6dc19d8
> ("Bluetooth: Enable per-module dynamic debug messages").

I just pushed the following fix for this, thanks Stephen:

bluetooth: Fix rfcomm_sock_ioctl() build failure with debugging enabled.

It's 'sock' not 'sk'.

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

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ad00cbf..ffaa6b0 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -792,7 +792,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
 #endif
 	int err;
 
-	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
+	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
 
 	err = bt_sock_ioctl(sock, cmd, arg);
 
-- 
1.5.6.5

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Tue, 09 Dec 2008 00:04:23 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> I just pushed the following fix for this, thanks Stephen:
> 
> bluetooth: Fix rfcomm_sock_ioctl() build failure with debugging enabled.
> 
> It's 'sock' not 'sk'.
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  net/bluetooth/rfcomm/sock.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
> index ad00cbf..ffaa6b0 100644
> --- a/net/bluetooth/rfcomm/sock.c
> +++ b/net/bluetooth/rfcomm/sock.c
> @@ -792,7 +792,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
>  #endif
>  	int err;
>  
> -	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
> +	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);

I am not sure this is correct as there is a "sk" defined just above here
but surrounded by

#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)

?
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Dec 2008 19:54:17 +1100

> Hi Dave,
> 
> On Tue, 09 Dec 2008 00:04:23 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> > diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
> > index ad00cbf..ffaa6b0 100644
> > --- a/net/bluetooth/rfcomm/sock.c
> > +++ b/net/bluetooth/rfcomm/sock.c
> > @@ -792,7 +792,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
> >  #endif
> >  	int err;
> >  
> > -	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
> > +	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
> 
> I am not sure this is correct as there is a "sk" defined just above here
> but surrounded by
> 
> #if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)

Hmmm...

BT_DBG is unconditionally defined these days.  And it evaluates to
pr_debug() which is conditional on other "DEBUG" or
"DYNAMIC_PRINTK_DEBUG".

This looks like a job for either __maybe_unused since I can't see
a clean way to keep this issue inside of the BT_DBG() macro
definition since it's varargs.

So, I've gone with this for now:

bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().

As Stephen Rothwell points out, we don't want 'sock' here but
rather we really do want 'sk'.

This local var is protected by all sorts of bluetooth debugging
kconfig vars, but BT_DBG() is just a straight pr_debug() call
which is unconditional.

pr_debug() evaluates it's args only if either DEBUG or
CONFIG_DYNAMIC_PRINTK_DEBUG is defined.

Solving this inside of the BT_DBG() macro is non-trivial since
it's varargs.  And these ifdefs are ugly.

So, just mark this 'sk' thing __maybe_unused and kill the ifdefs.

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

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ffaa6b0..d3fc6fc 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -787,12 +787,10 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
 
 static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
-#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
-	struct sock *sk = sock->sk;
-#endif
+	struct sock *sk __maybe_unused = sock->sk;
 	int err;
 
-	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
+	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
 
 	err = bt_sock_ioctl(sock, cmd, arg);
 
-- 
1.5.6.5

Re: linux-next: net tree build failure

[Marcel Holtmann]

Hi Dave,

> > On Tue, 09 Dec 2008 00:04:23 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> > > diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
> > > index ad00cbf..ffaa6b0 100644
> > > --- a/net/bluetooth/rfcomm/sock.c
> > > +++ b/net/bluetooth/rfcomm/sock.c
> > > @@ -792,7 +792,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
> > >  #endif
> > >  	int err;
> > >  
> > > -	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
> > > +	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
> > 
> > I am not sure this is correct as there is a "sk" defined just above here
> > but surrounded by
> > 
> > #if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
> 
> Hmmm...
> 
> BT_DBG is unconditionally defined these days.  And it evaluates to
> pr_debug() which is conditional on other "DEBUG" or
> "DYNAMIC_PRINTK_DEBUG".
> 
> This looks like a job for either __maybe_unused since I can't see
> a clean way to keep this issue inside of the BT_DBG() macro
> definition since it's varargs.
> 
> So, I've gone with this for now:
> 
> bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().
> 
> As Stephen Rothwell points out, we don't want 'sock' here but
> rather we really do want 'sk'.
> 
> This local var is protected by all sorts of bluetooth debugging
> kconfig vars, but BT_DBG() is just a straight pr_debug() call
> which is unconditional.
> 
> pr_debug() evaluates it's args only if either DEBUG or
> CONFIG_DYNAMIC_PRINTK_DEBUG is defined.
> 
> Solving this inside of the BT_DBG() macro is non-trivial since
> it's varargs.  And these ifdefs are ugly.
> 
> So, just mark this 'sk' thing __maybe_unused and kill the ifdefs.
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  net/bluetooth/rfcomm/sock.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
> index ffaa6b0..d3fc6fc 100644
> --- a/net/bluetooth/rfcomm/sock.c
> +++ b/net/bluetooth/rfcomm/sock.c
> @@ -787,12 +787,10 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
>  
>  static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
>  {
> -#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
> -	struct sock *sk = sock->sk;
> -#endif
> +	struct sock *sk __maybe_unused = sock->sk;
>  	int err;
>  
> -	BT_DBG("sk %p cmd %x arg %lx", sock, cmd, arg);
> +	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
>  
>  	err = bt_sock_ioctl(sock, cmd, arg);

Acked-by: Marcel Holtmann <marcel@holtmann.org>

This looks actually pretty much how it should be. The ifdefs got added
because someone actually saw a compiler warning of an unused variable
when disabling CONFIG_BT_RFCOMM_TTY. So in 99% of the case this is
enabled, because otherwise it makes no sense, but for some really
embedded stuff where no TTYs are required they can disable it and shrink
their kernel a lot.

Regards

Marcel

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

In file included from /net/decnet/netfilter/dn_rtmsg.c:26:
include/net/dn.h:7:26: error: asm/unalignedh: No such file or directory
In file included from net/decnet/netfilter/dn_rtmsg.c:26:
include/net/dn.h: In function 'dn_eth2dn':
include/net/dn.h:176: error: implicit declaration of function 'get_unaligned'

Caused by commit c4106aa88a440430d387e022f2ad6dc1e0d52e98 ("decnet:
remove private wrappers of endian helpers").  I can only assume that the
sparc64 allmodconfig doesn't include decnet ...

I will fix this one for you ... condsider it a late birthday present.  :-)

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Nov 2008 14:46:59 +1100

> I will fix this one for you ... condsider it a late birthday present.  :-)

You're too kind :)  net-next-2.6 has this fix in it now too.

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

net/bridge/br_netfilter.c:112: error: unknown field 'entry_size' specified in initializer
net/bridge/br_netfilter.c:112: warning: initialization makes pointer from integer without a cast

Caused by commit 631339f1e544a4d39a63cfe6708c5bddcd5a2c48 ("bridge:
netfilter: fix update_pmtu crash with GRE") from the net-current tree
interacting with commit 6bb3ce25d05f2990c8a19adaf427531430267c1f ("net:
remove struct dst_entry::entry_size") from the net tree.

I added the below patch as a temporary merge fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 0b3cd89..274194b 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -109,7 +109,6 @@ static struct dst_ops fake_dst_ops = {
 	.family =		AF_INET,
 	.protocol =		__constant_htons(ETH_P_IP),
 	.update_pmtu =		fake_update_pmtu,
-	.entry_size =		sizeof(struct rtable),
 	.entries =		ATOMIC_INIT(0),
 };
 
-- 
1.5.6.5

Re: linux-next: net tree build failure

[Herbert Xu]

On Wed, Nov 26, 2008 at 06:15:43PM +1100, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> net/bridge/br_netfilter.c:112: error: unknown field 'entry_size' specified in initializer
> net/bridge/br_netfilter.c:112: warning: initialization makes pointer from integer without a cast
> 
> Caused by commit 631339f1e544a4d39a63cfe6708c5bddcd5a2c48 ("bridge:
> netfilter: fix update_pmtu crash with GRE") from the net-current tree
> interacting with commit 6bb3ce25d05f2990c8a19adaf427531430267c1f ("net:
> remove struct dst_entry::entry_size") from the net tree.
> 
> I added the below patch as a temporary merge fix.

Yes your patch is correct.  Thanks Stephen!
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Nov 2008 18:15:43 +1100

> Today's linux-next build (x86_64 allmodconfig) failed like this:

Stephen, thanks for all of these merge and build fixups.

I think I'll do a preemptive merge later today of net-2.6 into
net-next-2.6 to try and resolve most of this.

But no promises as it's my birthday :)

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Wed, 26 Nov 2008 00:45:13 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 26 Nov 2008 18:15:43 +1100
> 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> Stephen, thanks for all of these merge and build fixups.
> 
> I think I'll do a preemptive merge later today of net-2.6 into
> net-next-2.6 to try and resolve most of this.

Then when the poobah returns from slacking off and rejects some stuff we
both can grumble :-)

Thanks.

> But no promises as it's my birthday :)

Happy Birthday!  Have a really nice long lunch (like until next
Monday :-))

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

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

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/pcmcia/axnet_cs.c:908: error: static declaration of 'ei_tx_timeout' follows non-static declaration
drivers/net/pcmcia/../8390.h:36: error: previous declaration of 'ei_tx_timeout' was here
drivers/net/pcmcia/axnet_cs.c:1056: error: static declaration of 'ei_start_xmit' follows non-static declaration
drivers/net/pcmcia/../8390.h:37: error: previous declaration of 'ei_start_xmit' was here

Caused by commit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec ("ne2k: convert
to net_device_ops").

I have dropped the net tree again.
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Nov 2008 13:43:01 +1100

> Caused by commit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec ("ne2k: convert
> to net_device_ops").
> 
> I have dropped the net tree again.

Can't you just revert the patch to fix the build instead? :-/

The net tree won't get much testing if every obscure driver build
failure makes the net tree get removed.

Re: linux-next: net tree build failure

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Sun, 23 Nov 2008 19:56:02 -0800 (PST)

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 24 Nov 2008 13:43:01 +1100
> 
> > Caused by commit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec ("ne2k: convert
> > to net_device_ops").
> > 
> > I have dropped the net tree again.
> 
> Can't you just revert the patch to fix the build instead? :-/

Or wait the 5 friggin' minutes it took me to compose and
push out this obvious patch.  It's not like we're not awake
at the same time :-/

axnet_cs: Fix build after net device ops ne2k conversion.

Commit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec ("ne2k: convert to
net_device_ops") exported some ei_* symbols from the 8390 library,
but the axnet_cs driver defines local static versions of the same
functions.

Rename them to avoid the namespace conflict.

Reported by Stephen Rothwell.

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

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 2aca8df..c9890b4 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -904,7 +904,7 @@ int ei_debug = 1;
 /* Index to functions. */
 static void ei_tx_intr(struct net_device *dev);
 static void ei_tx_err(struct net_device *dev);
-static void ei_tx_timeout(struct net_device *dev);
+static void axnet_tx_timeout(struct net_device *dev);
 static void ei_receive(struct net_device *dev);
 static void ei_rx_overrun(struct net_device *dev);
 
@@ -955,9 +955,9 @@ static int ax_open(struct net_device *dev)
 
 #ifdef HAVE_TX_TIMEOUT
 	/* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout
-	    wrapper that does e.g. media check & then calls ei_tx_timeout. */
+	    wrapper that does e.g. media check & then calls axnet_tx_timeout. */
 	if (dev->tx_timeout == NULL)
-		 dev->tx_timeout = ei_tx_timeout;
+		 dev->tx_timeout = axnet_tx_timeout;
 	if (dev->watchdog_timeo <= 0)
 		 dev->watchdog_timeo = TX_TIMEOUT;
 #endif
@@ -1001,14 +1001,14 @@ static int ax_close(struct net_device *dev)
 }
 
 /**
- * ei_tx_timeout - handle transmit time out condition
+ * axnet_tx_timeout - handle transmit time out condition
  * @dev: network device which has apparently fallen asleep
  *
  * Called by kernel when device never acknowledges a transmit has
  * completed (or failed) - i.e. never posted a Tx related interrupt.
  */
 
-static void ei_tx_timeout(struct net_device *dev)
+static void axnet_tx_timeout(struct net_device *dev)
 {
 	long e8390_base = dev->base_addr;
 	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1045,14 +1045,14 @@ static void ei_tx_timeout(struct net_device *dev)
 }
     
 /**
- * ei_start_xmit - begin packet transmission
+ * axnet_start_xmit - begin packet transmission
  * @skb: packet to be sent
  * @dev: network device to which packet is sent
  *
  * Sends a packet to an 8390 network device.
  */
  
-static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	long e8390_base = dev->base_addr;
 	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
@@ -1718,7 +1718,7 @@ static void axdev_setup(struct net_device *dev)
 	ei_local = (struct ei_device *)netdev_priv(dev);
 	spin_lock_init(&ei_local->page_lock);
     
-	dev->hard_start_xmit = &ei_start_xmit;
+	dev->hard_start_xmit = &axnet_start_xmit;
 	dev->get_stats	= get_stats;
 	dev->set_multicast_list = &set_multicast_list;
 
-- 
1.5.6.5

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Sun, 23 Nov 2008 19:56:02 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Can't you just revert the patch to fix the build instead? :-/

[I realise you are not being completely serious, but I am just taking the
opportunity to stat my position - don't take it personally].

Sorry, no.  If the build failure is caused by an interaction between two
trees in linux-next, then I will spend some time trying to fix it up.
However, a simple allmodconfig (even on sparc64, I think) build would
have shown you the failure *before* publishing your tree.

This is me practising my new "Arrogant Bastard"(tm) style of teaching. :-)
-- 
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 failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Nov 2008 15:25:50 +1100

> Sorry, no.  If the build failure is caused by an interaction between two
> trees in linux-next, then I will spend some time trying to fix it up.
> However, a simple allmodconfig (even on sparc64, I think) build would
> have shown you the failure *before* publishing your tree.

Would not, I do an allmodconfig build on sparc64 before every
push of the net-next-2.6 tree.

That's why I'm so irritated by this.

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Sun, 23 Nov 2008 20:28:47 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 24 Nov 2008 15:25:50 +1100
> 
> > Sorry, no.  If the build failure is caused by an interaction between two
> > trees in linux-next, then I will spend some time trying to fix it up.
> > However, a simple allmodconfig (even on sparc64, I think) build would
> > have shown you the failure *before* publishing your tree.
> 
> Would not, I do an allmodconfig build on sparc64 before every
> push of the net-next-2.6 tree.

So I wonder what prevents CONFIG_PCMCIA being set on a sparc64
allmodconfig?  Just looking at the Kconfig files, I thought it would, but
obviously not.

It means, of course, that that build doesn't test any of the possible
effects of network changes on the PCMCIA device drivers.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Nov 2008 15:49:38 +1100

> So I wonder what prevents CONFIG_PCMCIA being set on a sparc64
> allmodconfig?  Just looking at the Kconfig files, I thought it
> would, but obviously not.

drivers/Kconfig doesn't include drivers/pcmcia/Kconfig,
each arch Kconfig has to do it explicitly

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Sun, 23 Nov 2008 21:04:52 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 24 Nov 2008 15:49:38 +1100
> 
> > So I wonder what prevents CONFIG_PCMCIA being set on a sparc64
> > allmodconfig?  Just looking at the Kconfig files, I thought it
> > would, but obviously not.
> 
> drivers/Kconfig doesn't include drivers/pcmcia/Kconfig,
> each arch Kconfig has to do it explicitly

Yeah, and including it does turn CONFIG_PCMCIA on. But I am genuinely
curious as there is a CONFIG_PCMCIA entry (with a really ancient comment)
in arch/sparc64/Kconfig, so why is that not sufficient to get
CONFIG_PCMCIA turned on?  There is clearly something lacking in my
understanding ...

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

[Stephen Rothwell]

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

Hi Dave,

On Mon, 24 Nov 2008 16:20:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Yeah, and including it does turn CONFIG_PCMCIA on. But I am genuinely
> curious as there is a CONFIG_PCMCIA entry (with a really ancient comment)
> in arch/sparc64/Kconfig, so why is that not sufficient to get
> CONFIG_PCMCIA turned on?  There is clearly something lacking in my
> understanding ...

(Light dawns) I guess it is the lack of a prompt ...

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Nov 2008 16:20:44 +1100

> Yeah, and including it does turn CONFIG_PCMCIA on. But I am genuinely
> curious as there is a CONFIG_PCMCIA entry (with a really ancient comment)
> in arch/sparc64/Kconfig, so why is that not sufficient to get
> CONFIG_PCMCIA turned on?  There is clearly something lacking in my
> understanding ...

Probably it didn't build for some obscure reason a long time
ago.  I'll try to get it turned back on, but better is to
bring it in via drivers/Kconfig don't you think? :-)

Re: linux-next: net tree build failure

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Sun, 23 Nov 2008 21:23:39 -0800 (PST)

> I'll try to get it turned back on,

Ok the following seems to build on sparc64, so after some
sparc 32-bit build tests I'll check this into sparc-next-2.6

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 41c4cd2..10945c3 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -435,24 +435,6 @@ config MCA
 	help
 	  MCA is not supported.
 
-config PCMCIA
-	tristate
-	---help---
-	  Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
-	  computer.  These are credit-card size devices such as network cards,
-	  modems or hard drives often used with laptops computers.  There are
-	  actually two varieties of these cards: the older 16 bit PCMCIA cards
-	  and the newer 32 bit CardBus cards.  If you want to use CardBus
-	  cards, you need to say Y here and also to "CardBus support" below.
-
-	  To use your PC-cards, you will need supporting software from David
-	  Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
-	  for location).  Please also read the PCMCIA-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as modules, choose M here: the
-	  modules will be called pcmcia_core and ds.
-
 config SBUS
 	bool
 	default y
@@ -497,6 +479,8 @@ config PCI_SYSCALL
 
 source "drivers/pci/Kconfig"
 
+source "drivers/pcmcia/Kconfig"
+
 config SUN_OPENPROMFS
 	tristate "Openprom tree appears in /proc/openprom"
 	help

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Sun, 23 Nov 2008 21:29:29 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: David Miller <davem@davemloft.net>
> Date: Sun, 23 Nov 2008 21:23:39 -0800 (PST)
> 
> > I'll try to get it turned back on,
> 
> Ok the following seems to build on sparc64, so after some
> sparc 32-bit build tests I'll check this into sparc-next-2.6

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 failure

[Stephen Rothwell]

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

On Sun, 23 Nov 2008 21:23:39 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Probably it didn't build for some obscure reason a long time
> ago.  I'll try to get it turned back on, but better is to
> bring it in via drivers/Kconfig don't you think? :-)

Only if you test build all the other architectures that currently don't
include it. :-)

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

[Sam Ravnborg]

On Mon, Nov 24, 2008 at 04:38:44PM +1100, Stephen Rothwell wrote:
> On Sun, 23 Nov 2008 21:23:39 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > Probably it didn't build for some obscure reason a long time
> > ago.  I'll try to get it turned back on, but better is to
> > bring it in via drivers/Kconfig don't you think? :-)
> 
> Only if you test build all the other architectures that currently don't
> include it. :-)

Stephen, could I ask you to try to do so?
You have the infrastructure to do it.

I would love to see any simplification of the nightmare
of Kconfig files we have.


I have only: arm, x86, sparc sparc64, alpha here so that
does not give any decent enough coverage.

And my current Linux box is a Pentium 850 MHz so it would take
forever...

	Sam

Re: linux-next: net tree build failure

[Stephen Hemminger]

On Mon, 24 Nov 2008 22:00:28 +0100
Sam Ravnborg <sam@ravnborg.org> wrote:

> On Mon, Nov 24, 2008 at 04:38:44PM +1100, Stephen Rothwell wrote:
> > On Sun, 23 Nov 2008 21:23:39 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> > >
> > > Probably it didn't build for some obscure reason a long time
> > > ago.  I'll try to get it turned back on, but better is to
> > > bring it in via drivers/Kconfig don't you think? :-)
> > 
> > Only if you test build all the other architectures that currently don't
> > include it. :-)
> 
> Stephen, could I ask you to try to do so?
> You have the infrastructure to do it.
> 
> I would love to see any simplification of the nightmare
> of Kconfig files we have.
> 
> 
> I have only: arm, x86, sparc sparc64, alpha here so that
> does not give any decent enough coverage.
> 
> And my current Linux box is a Pentium 850 MHz so it would take
> forever...
> 
> 	Sam

I will try and run 'make all modconfig' on x86, I don't have volunteer
time to do cross build of all architectures. But isn't the purpose
of linux-next to find/fix these things. If linux-net has to be perfect
every minute then there is no purpose in having it.

Re: linux-next: net tree build failure

[Sam Ravnborg]

On Mon, Nov 24, 2008 at 01:52:51PM -0800, Stephen Hemminger wrote:
> On Mon, 24 Nov 2008 22:00:28 +0100
> Sam Ravnborg <sam@ravnborg.org> wrote:
> 
> > On Mon, Nov 24, 2008 at 04:38:44PM +1100, Stephen Rothwell wrote:
> > > On Sun, 23 Nov 2008 21:23:39 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> > > >
> > > > Probably it didn't build for some obscure reason a long time
> > > > ago.  I'll try to get it turned back on, but better is to
> > > > bring it in via drivers/Kconfig don't you think? :-)
> > > 
> > > Only if you test build all the other architectures that currently don't
> > > include it. :-)
> > 
> > Stephen, could I ask you to try to do so?
> > You have the infrastructure to do it.
> > 
> > I would love to see any simplification of the nightmare
> > of Kconfig files we have.
> > 
> > 
> > I have only: arm, x86, sparc sparc64, alpha here so that
> > does not give any decent enough coverage.
> > 
> > And my current Linux box is a Pentium 850 MHz so it would take
> > forever...
> > 
> > 	Sam
> 
> I will try and run 'make all modconfig' on x86, I don't have volunteer
> time to do cross build of all architectures. But isn't the purpose
> of linux-next to find/fix these things. If linux-net has to be perfect
> every minute then there is no purpose in having it.

Hi Stephen - it was Stepehn Rothwell I had in mind when I wrote the above :-)

Anyway - I can see that only "cris m68k parisc s390 sparc sparc64 um" lacks
the include of drivers/scsi/pcmcia/Kconfig.
So I will try to add it to drivers/Kconfig in my tree and see it -next
blows up. I will wait until next -next as I want to see my current
pending patches there in a clean run first.

	Sam

> 

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Sam,

On Mon, 24 Nov 2008 23:12:32 +0100 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Anyway - I can see that only "cris m68k parisc s390 sparc sparc64 um" lacks

Actually parisc gets it through drivers/parisc/Kconfig.
 
> the include of drivers/scsi/pcmcia/Kconfig.
> So I will try to add it to drivers/Kconfig in my tree and see it -next
> blows up. I will wait until next -next as I want to see my current
> pending patches there in a clean run first.

I started to do this but then decided that ordering of the includes may
need some thought.

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

[Sam Ravnborg]

On Tue, Nov 25, 2008 at 07:42:57PM +1100, Stephen Rothwell wrote:
> Hi Sam,
> 
> On Mon, 24 Nov 2008 23:12:32 +0100 Sam Ravnborg <sam@ravnborg.org> wrote:
> >
> > Anyway - I can see that only "cris m68k parisc s390 sparc sparc64 um" lacks
> 
> Actually parisc gets it through drivers/parisc/Kconfig.
>  
> > the include of drivers/scsi/pcmcia/Kconfig.
> > So I will try to add it to drivers/Kconfig in my tree and see it -next
> > blows up. I will wait until next -next as I want to see my current
> > pending patches there in a clean run first.
> 
> I started to do this but then decided that ordering of the includes may
> need some thought.

x86 at least put it in the "Bus" menu where I also think it belongs.
So it is not a simple move to drivers/Kconfig as I orginally thought
and I think we should let it be as it is for now.

	Sam

linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

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

drivers/net/acenic.c:461: error: 'ace_vlan_rx_register' undeclared here (not in a function)

Caused by commit d8b83c57a7e497cba9b5cb156e63176323035785 ("acenic:
convert to net_device_ops").  This commit should also be looked at
again as ace_vlan_rx_register() is only defined if ACENIC_DO_VLAN is
set but it is used in net_device_ops unconditionally.   And it needs to
be forward declared to get rid of the compiler error above, of course.

I have dropped the net tree for today.
-- 
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 failure

[Stephen Hemminger]

On Fri, 21 Nov 2008 13:44:57 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Dave,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/net/acenic.c:461: error: 'ace_vlan_rx_register' undeclared here (not in a function)
> 
> Caused by commit d8b83c57a7e497cba9b5cb156e63176323035785 ("acenic:
> convert to net_device_ops").  This commit should also be looked at
> again as ace_vlan_rx_register() is only defined if ACENIC_DO_VLAN is
> set but it is used in net_device_ops unconditionally.   And it needs to
> be forward declared to get rid of the compiler error above, of course.
> 
> I have dropped the net tree for today.

Fixed by later patch (in second wave)

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 20 Nov 2008 20:02:26 -0800

> On Fri, 21 Nov 2008 13:44:57 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Dave,
> > 
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > drivers/net/acenic.c:461: error: 'ace_vlan_rx_register' undeclared here (not in a function)
> > 
> > Caused by commit d8b83c57a7e497cba9b5cb156e63176323035785 ("acenic:
> > convert to net_device_ops").  This commit should also be looked at
> > again as ace_vlan_rx_register() is only defined if ACENIC_DO_VLAN is
> > set but it is used in net_device_ops unconditionally.   And it needs to
> > be forward declared to get rid of the compiler error above, of course.
> > 
> > I have dropped the net tree for today.
> 
> Fixed by later patch (in second wave)

Yep, I'll take care of this tonight.

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/wireless/iwlwifi/iwl3945-base.c: In function 'iwl3945_bg_set_monitor':
drivers/net/wireless/iwlwifi/iwl3945-base.c:6001: error: implicit declaration of function 'ieee80211_notify_mac'
drivers/net/wireless/iwlwifi/iwl3945-base.c:6001: error: 'IEEE80211_NOTIFY_RE_ASSOC' undeclared (first use in this function)
drivers/net/wireless/iwlwifi/iwl-agn.c: In function 'iwl_bg_set_monitor':
drivers/net/wireless/iwlwifi/iwl-agn.c:2392: error: implicit declaration of function 'ieee80211_notify_mac'
drivers/net/wireless/iwlwifi/iwl-agn.c:2392: error: 'IEEE80211_NOTIFY_RE_ASSOC' undeclared (first use in this function)

Another bad interaction, this time between commit
8e3bad65a59915f2ddc40f62a180ad81695d8440 "mac80211: remove
ieee80211_notify_mac" from the wireless-current tree and commit
60294de3af99586bb4a205274d02a7c8b910c0c3 "iwlwifi: fix priv->iw_mode
setting when multiple vif are configured" from the net tree.

I added the following (which may not be correct) to fix the merge but
assume it will be fixed in the net tree soon.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5998,7 +5998,6 @@ static void iwl3945_bg_set_monitor(struct work_struct *work)
 			IWL_ERROR("iwl3945_set_mode() failed\n");
 
 	mutex_unlock(&priv->mutex);
-	ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 }
 
 #define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2389,7 +2389,6 @@ static void iwl_bg_set_monitor(struct work_struct *work)
 	}
 
 	mutex_unlock(&priv->mutex);
-	ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 }
 
 static void iwl_bg_run_time_calib_work(struct work_struct *work)

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

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

net/core/dev.c: In function 'net_dev_init':
net/core/dev.c:4775: error: implicit declaration of function 'netdev_dma_register'

A bad interaction between commit 505d4f73dda9e20d59da05008f1f5eb432613e71
"net: Guaranetee the proper ordering of the loopback device. v2" from the
net tree (which moved a call to netdev_dma_register) and commit
8f3da0d613494b02f8628bb5dbf2366f0298505c "dmaengine: kill struct
dma_client and supporting infrastructure" from the async_tx tree (which
removes the call).

I added the below patch to fix up the merge and can carry it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 97115a9dfb4eda07a4f581d46379de9f0f65f158 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Nov 2008 13:25:08 +1100
Subject: [PATCH] net: async_tx merge fix

---
 net/core/dev.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index c3f5713..e9cf36e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4772,8 +4772,6 @@ static int __init net_dev_init(void)
 	if (register_pernet_device(&default_device_ops))
 		goto out;
 
-	netdev_dma_register();
-
 	open_softirq(NET_TX_SOFTIRQ, net_tx_action);
 	open_softirq(NET_RX_SOFTIRQ, net_rx_action);
 
-- 
1.5.6.5

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dan,

On Thu, 20 Nov 2008 13:30:36 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> net/core/dev.c: In function 'net_dev_init':
> net/core/dev.c:4775: error: implicit declaration of function 'netdev_dma_register'
> 
> A bad interaction between commit 505d4f73dda9e20d59da05008f1f5eb432613e71
> "net: Guaranetee the proper ordering of the loopback device. v2" from the
> net tree (which moved a call to netdev_dma_register) and commit
> 8f3da0d613494b02f8628bb5dbf2366f0298505c "dmaengine: kill struct
> dma_client and supporting infrastructure" from the async_tx tree (which
> removes the call).
> 
> I added the below patch to fix up the merge and can carry it.

This now occurs when I merge the async_tx tree as the net tree has been
merged into Linus' tree.  You should fix this (by merging Linus' tree
into yours and doing the fixup below as part of the merge commit) before
asking Linus to pull your tree.

> diff --git a/net/core/dev.c b/net/core/dev.c
> index c3f5713..e9cf36e 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -4772,8 +4772,6 @@ static int __init net_dev_init(void)
>  	if (register_pernet_device(&default_device_ops))
>  		goto out;
>  
> -	netdev_dma_register();
> -
>  	open_softirq(NET_TX_SOFTIRQ, net_tx_action);
>  	open_softirq(NET_RX_SOFTIRQ, net_rx_action);
>  

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

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

linux-next: net tree build failure

[Stephen Rothwell]

Hi Dave,

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

net/ipv4/ipvs/ip_vs_proto_tcp.c: In function 'tcp_snat_handler':
net/ipv4/ipvs/ip_vs_proto_tcp.c:208: error: implicit declaration of function 'csum_ipv6_magic'
net/ipv4/ipvs/ip_vs_proto_udp.c: In function 'udp_snat_handler':
net/ipv4/ipvs/ip_vs_proto_udp.c:219: error: implicit declaration of function 'csum_ipv6_magic'

Introduced by commit 0bbdd42b7efa66685b6d74701bcde3a596a3a59d ("IPVS:
Extend protocol DNAT/SNAT and state handlers") which added a call to
csum_ipv6_magic but didn't include net/ip6_checksum.h.  I applied the
following patch.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 13 Sep 2008 14:37:04 +1000
Subject: [PATCH] net: ip_vs_proto_tcp build fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/ipv4/ipvs/ip_vs_proto_tcp.c |    1 +
 net/ipv4/ipvs/ip_vs_proto_udp.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c
index 537f616..dd4566e 100644
--- a/net/ipv4/ipvs/ip_vs_proto_tcp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c
@@ -18,6 +18,7 @@
 #include <linux/tcp.h>                  /* for tcphdr */
 #include <net/ip.h>
 #include <net/tcp.h>                    /* for csum_tcpudp_magic */
+#include <net/ip6_checksum.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
 
diff --git a/net/ipv4/ipvs/ip_vs_proto_udp.c b/net/ipv4/ipvs/ip_vs_proto_udp.c
index e3ee26b..6eb6039 100644
--- a/net/ipv4/ipvs/ip_vs_proto_udp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_udp.c
@@ -22,6 +22,7 @@
 
 #include <net/ip_vs.h>
 #include <net/ip.h>
+#include <net/ip6_checksum.h>
 
 static struct ip_vs_conn *
 udp_conn_in_get(int af, const struct sk_buff *skb, struct ip_vs_protocol *pp,
-- 
1.5.6.3

Re: linux-next: net tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 13 Sep 2008 15:03:26 +1000

> net: ip_vs_proto_tcp build fix
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

I updated the commit message to mention ip_vs_proto_udp since you
fixed that too :-)

Re: linux-next: net tree build failure

[Stephen Rothwell]

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

Hi Dave,

On Fri, 12 Sep 2008 23:24:21 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I updated the commit message to mention ip_vs_proto_udp since you
> fixed that too :-)

Thanks.  I actually got the errors on two separate builds and laziness
set in :-)

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

[Simon Horman]

On Sat, Sep 13, 2008 at 03:03:26PM +1000, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> net/ipv4/ipvs/ip_vs_proto_tcp.c: In function 'tcp_snat_handler':
> net/ipv4/ipvs/ip_vs_proto_tcp.c:208: error: implicit declaration of function 'csum_ipv6_magic'
> net/ipv4/ipvs/ip_vs_proto_udp.c: In function 'udp_snat_handler':
> net/ipv4/ipvs/ip_vs_proto_udp.c:219: error: implicit declaration of function 'csum_ipv6_magic'
> 
> Introduced by commit 0bbdd42b7efa66685b6d74701bcde3a596a3a59d ("IPVS:
> Extend protocol DNAT/SNAT and state handlers") which added a call to
> csum_ipv6_magic but didn't include net/ip6_checksum.h.  I applied the
> following patch.

Hi Stephen, Hi Dave, Hi all,

sorry for letting that one slip through.

I am wondering if it is appropriate to wrap these includes
in #ifdef CONFIG_IP_VS_IPV6, as csum_ipv6_magic() should only
be used in that case.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sat, 13 Sep 2008 14:37:04 +1000
> Subject: [PATCH] net: ip_vs_proto_tcp build fix
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/ipv4/ipvs/ip_vs_proto_tcp.c |    1 +
>  net/ipv4/ipvs/ip_vs_proto_udp.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c
> index 537f616..dd4566e 100644
> --- a/net/ipv4/ipvs/ip_vs_proto_tcp.c
> +++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c
> @@ -18,6 +18,7 @@
>  #include <linux/tcp.h>                  /* for tcphdr */
>  #include <net/ip.h>
>  #include <net/tcp.h>                    /* for csum_tcpudp_magic */
> +#include <net/ip6_checksum.h>
>  #include <linux/netfilter.h>
>  #include <linux/netfilter_ipv4.h>
>  
> diff --git a/net/ipv4/ipvs/ip_vs_proto_udp.c b/net/ipv4/ipvs/ip_vs_proto_udp.c
> index e3ee26b..6eb6039 100644
> --- a/net/ipv4/ipvs/ip_vs_proto_udp.c
> +++ b/net/ipv4/ipvs/ip_vs_proto_udp.c
> @@ -22,6 +22,7 @@
>  
>  #include <net/ip_vs.h>
>  #include <net/ip.h>
> +#include <net/ip6_checksum.h>
>  
>  static struct ip_vs_conn *
>  udp_conn_in_get(int af, const struct sk_buff *skb, struct ip_vs_protocol *pp,
> -- 
> 1.5.6.3

-- 
Simon Horman
  VA Linux Systems Japan K.K., Sydney, Australia Satellite Office
  H: www.vergenet.net/~horms/             W: www.valinux.co.jp/en