Skip to content

Commit

Permalink
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-…
Browse files Browse the repository at this point in the history
…2.6.git
  • Loading branch information
Linus Torvalds committed May 4, 2005
2 parents 41832a0 + 6a800d4 commit 235bd61
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/net/addrconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#define IPV6_MAX_ADDRESSES 16

#include <linux/in6.h>

struct prefix_info {
__u8 type;
__u8 length;
Expand All @@ -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>
Expand Down

0 comments on commit 235bd61

Please sign in to comment.