diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-06 04:25:13 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-06 04:25:13 +0100 |
| commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
| tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /include/net/ndisc.h | |
| parent | Input: wistron - convert to the new platform device interface (diff) | |
| parent | [NET]: Change 1500 to ETH_DATA_LEN in some files (diff) | |
| download | linux-fed8bf19ec20efc0641740b2d10aa589dbd6d1ab.tar.xz linux-fed8bf19ec20efc0641740b2d10aa589dbd6d1ab.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/ndisc.h')
| -rw-r--r-- | include/net/ndisc.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index f85d6e4b7442..bbac87eeb422 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -35,11 +35,20 @@ enum { #ifdef __KERNEL__ -#include <linux/skbuff.h> -#include <linux/netdevice.h> +#include <linux/config.h> +#include <linux/compiler.h> #include <linux/icmpv6.h> +#include <linux/in6.h> +#include <linux/types.h> + #include <net/neighbour.h> -#include <asm/atomic.h> + +struct ctl_table; +struct file; +struct inet6_dev; +struct net_device; +struct net_proto_family; +struct sk_buff; extern struct neigh_table nd_tbl; @@ -108,7 +117,7 @@ extern int igmp6_event_report(struct sk_buff *skb); extern void igmp6_cleanup(void); #ifdef CONFIG_SYSCTL -extern int ndisc_ifinfo_sysctl_change(ctl_table *ctl, +extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * filp, void __user *buffer, |