projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
include
/
net
/
addrconf.h
diff --git
a/include/net/addrconf.h
b/include/net/addrconf.h
index
f1e5af4
..
a0ed936
100644
(file)
--- 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>