summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:06:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 07:06:38 -0700
commit235bd6140dad7c08261abdc1f8056485c5344a74 (patch)
treef5f7a1ffb34885802af581b8e61b61d52f885c39
parent41832a08feca695158e15a6e58c26b224a7bfae2 (diff)
parent6a800d456a81a9046634bcd26d868fd537f0c9ae (diff)
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
-rw-r--r--include/net/addrconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index f1e5af4be98..a0ed9367217 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -17,6 +17,8 @@
#define IPV6_MAX_ADDRESSES 16
+#include <linux/in6.h>
+
struct prefix_info {
__u8 type;
__u8 length;
@@ -43,7 +45,6 @@ struct prefix_info {
#ifdef __KERNEL__
-#include <linux/in6.h>
#include <linux/netdevice.h>
#include <net/if_inet6.h>
#include <net/ipv6.h>