Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

235bd614 · Linus Torvalds · 41832a08 · 6a800d45 · 235bd614
显示空白变更内容
内联并排

Showing with 2 addition and 1 deletion

include/net/addrconf.h include/net/addrconf.h +2 -1

未找到文件。
--- 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>