Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 235bd614 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 41832a08 6a800d45

include/net/addrconf.h

+2 −1
Original line number Diff line number Diff line
@@ -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>