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

This commit is contained in:
Linus Torvalds 2005-05-04 07:06:38 -07:00
commit 235bd6140d

View File

@ -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>