Skip to contentSkip to conversation

linux-next: build failure after merge of the final tree (net-next tree related)

PATCH In review Stephen Rothwell 3 participants 4 messages Apr 30, 2012

Subsystems (3)
Networking Network drivers Linux-next tree
lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

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

net/l2tp/l2tp_core.c: In function 'l2tp_verify_udp_checksum':
net/l2tp/l2tp_core.c:464:7: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]

Caused by commit d2cf3361677e ("net/l2tp: add support for L2TP over IPv6 UDP"). Include file missing.

I have reverted that commit for today.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
maintainer Applied
#1 lore raw

From: Stephen Rothwell <[email protected]>
Date: Mon, 30 Apr 2012 15:58:36 +1000

Quoted 5 lines

Hi all,

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

Quoted 7 lines

net/l2tp/l2tp_core.c: In function 'l2tp_verify_udp_checksum':
net/l2tp/l2tp_core.c:464:7: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]

Caused by commit d2cf3361677e ("net/l2tp: add support for L2TP over IPv6 UDP"). Include file missing.

I have reverted that commit for today.

The fix is less work than the revert on this one isn't it? :-)

Pushed to net-next, thanks Stephen:

--------------------
l2tp: Add missing net/net/ip6_checksum.h include.

Reported-by Stephen Rothwell <[email protected]>
Signed-off-by David S. Miller <[email protected]>
---
 net/l2tp/l2tp_core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/l2tp/l2tp_core.c +1 -0
index e91d559..0ca9bc3 100644
@@ -56,6 +56,7 @@
 #include <net/inet6_connection_sock.h>
 #include <net/inet_ecn.h>
 #include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
 
 #include <asm/byteorder.h>
 #include <linux/atomic.h>
Signature · 1 line
1.7.7.6
#2 lore raw

PATCH 1/1 net/l2tp: fix build error in l2tp from missing ipv6 checksum include

In reply to Stephen Rothwell

Hi Stephen,

Can you please verify if the patch below fixes the issue? Thanks.

-ben
----
net/l2tp: fix build error in l2tp from missing ipv6 checksum include

L2TP needs to ensure the IPv6 checksum helpers are included.

Signed-off-by Benjamin LaHaise <[email protected]>

---

net/l2tp/l2tp_core.c +1 -0
index e91d559..0ca9bc3 100644
@@ -56,6 +56,7 @@
 #include <net/inet6_connection_sock.h>
 #include <net/inet_ecn.h>
 #include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
 
 #include <asm/byteorder.h>
 #include <linux/atomic.h>
maintainer
#3 lore raw

Re: [PATCH net-next] net/l2tp: fix build error in l2tp from missing ipv6 checksum include

From: Benjamin LaHaise <[email protected]>
Date: Mon, 30 Apr 2012 13:24:02 -0400

Quoted 1 line

Can you please verify if the patch below fixes the issue? Thanks.

I already checked a fix into the tree.