2013-07-29 06:25:56

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the final tree (netnext-tree related)

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

net/core/pktgen.c: In function 'fill_packet_ipv6':
net/core/pktgen.c:2906:3: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
udph->check = ~csum_ipv6_magic(&iph->saddr, &iph->daddr, udplen, IPPROTO_UDP, 0);
^

Caused by commit c26bf4a51308 ("pktgen: Add UDPCSUM flag to support UDP checksums") from the net-next tree.

I added this commit:

From: Stephen Rothwell <[email protected]>
Date: Mon, 29 Jul 2013 16:21:26 +1000
Subject: [PATCH] pktgen: add needed include file

Fixes this on PowerPC (at least):

net/core/pktgen.c: In function 'fill_packet_ipv6':
net/core/pktgen.c:2906:3: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
udph->check = ~csum_ipv6_magic(&iph->saddr, &iph->daddr, udplen, IPPROTO_UDP, 0);
^

Signed-off-by: Stephen Rothwell <[email protected]>
---
net/core/pktgen.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 2dec6f1..261357a 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -161,6 +161,7 @@
#include <net/checksum.h>
#include <net/ipv6.h>
#include <net/udp.h>
+#include <net/ip6_checksum.h>
#include <net/addrconf.h>
#ifdef CONFIG_XFRM
#include <net/xfrm.h>
--
1.8.4.rc0

--
Cheers,
Stephen Rothwell [email protected]

Attachments:
(No filename) (1.43 kB)
 (No filename) (836.00 B)
 Download all attachments

2013-07-29 07:47:49

by David Miller

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree (netnext-tree related)

From: Stephen Rothwell <[email protected]>
Date: Mon, 29 Jul 2013 16:25:44 +1000

> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:

Sorry about that.

> I added this commit:

Applied, thanks Stephen.

2013-07-29 08:13:53

by Thomas Graf

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree (netnext-tree related)

On 07/29/13 at 12:47am, David Miller wrote:
> From: Stephen Rothwell <[email protected]>
> Date: Mon, 29 Jul 2013 16:25:44 +1000
>
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
>
> Sorry about that.
>
> > I added this commit:
>
> Applied, thanks Stephen.

Thanks for the fix-up Stephen, the include is needed on archs that
don't provide an optimized csum_ipv6_magic().