summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2009-10-07 13:57:10 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-07 13:57:10 -0700
commit125a77ed9fbd21d1277f53e9ed6b39ad3d34e613 (patch)
treebdfc4ac6cb81b6a54103622c008927070c1ad4b5
parentffce908246c93b17304c313886d25cfa8aecd1d7 (diff)
downloadlwn-125a77ed9fbd21d1277f53e9ed6b39ad3d34e613.tar.gz
lwn-125a77ed9fbd21d1277f53e9ed6b39ad3d34e613.zip
IPv6: Fix 6RD build error
Fix build error introduced in commit fa857afcf - ipv6 sit: 6rd (IPv6 Rapid Deployment) Support. Struct in6_addr is the issue. I'm only seeing this on x86_64 systems, not on 32-bit with same IPv6 config options, so it could be there's a missing forward declaration somewhere, but including the correct header file fixes the problem too. CC [M] net/ipv6/ip6_tunnel.o In file included from net/ipv6/ip6_tunnel.c:31: include/linux/if_tunnel.h:59: error: field ‘prefix’ has incomplete type make[2]: *** [net/ipv6/ip6_tunnel.o] Error 1 make[1]: *** [net/ipv6] Error 2 Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/if_tunnel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index c53c8e016940..8d76cb4c86fa 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -5,6 +5,7 @@
#ifdef __KERNEL__
#include <linux/ip.h>
+#include <linux/in6.h>
#endif
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)