| Message ID | 20130729162544.574e4d7ffccf0f6bff5ba4c4@canb.auug.org.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Rothwell <sfr@canb.auug.org.au> 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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/29/13 at 12:47am, David Miller wrote: > From: Stephen Rothwell <sfr@canb.auug.org.au> > 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(). -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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>
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 <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au> --- net/core/pktgen.c | 1 + 1 file changed, 1 insertion(+)