do not declare nd_setmtu() here. pull nd6.h

kame · Jun 8, 2002 · 9928799 · 9928799
1 parent 6c25186
commit 9928799
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 44 deletions.
diff --git a/freebsd2/sys/net/if.c b/freebsd2/sys/net/if.c
@@ -84,9 +84,9 @@
 #include <net/radix.h>
 
 #ifdef INET6
-/*XXX*/
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
 #endif
 
 /*
@@ -109,14 +109,6 @@ SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL)
 int ifqmaxlen = IFQ_MAXLEN;
 struct ifnet *ifnet;
 
-#ifdef INET6
-/*
- * XXX: declare here to avoid to include many inet6 related files..
- * should be more generalized?
- */
-extern void nd6_setmtu __P((struct ifnet *));
-#endif 
-
 /*
  * Network interface utility routines.
  *

diff --git a/freebsd3/sys/net/if.c b/freebsd3/sys/net/if.c
@@ -86,9 +86,9 @@
 #include <net/radix.h>
 
 #ifdef INET6
-/*XXX*/
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
 #endif
 
 /*
@@ -114,14 +114,6 @@ MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address");
 int	ifqmaxlen = IFQ_MAXLEN;
 struct	ifnethead ifnet;	/* depend on static init XXX */
 
-#ifdef INET6
-/*
- * XXX: declare here to avoid to include many inet6 related files..
- * should be more generalized?
- */
-extern void nd6_setmtu __P((struct ifnet *));
-#endif 
-
 /*
  * Network interface utility routines.
  *

diff --git a/freebsd4/sys/net/if.c b/freebsd4/sys/net/if.c
@@ -61,13 +61,13 @@
 #include <net/route.h>
 
 #if defined(INET) || defined(INET6)
-/*XXX*/
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #ifdef INET6
 #include <machine/clock.h> /* XXX: temporal workaround for fxp issue */
 #include <netinet6/in6_var.h>
 #include <netinet6/in6_ifattach.h>
+#include <netinet6/nd6.h>
 #endif
 #endif
 
@@ -96,14 +96,6 @@ MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address");
 int	ifqmaxlen = IFQ_MAXLEN;
 struct	ifnethead ifnet;	/* depend on static init XXX */
 
-#ifdef INET6
-/*
- * XXX: declare here to avoid to include many inet6 related files..
- * should be more generalized?
- */
-extern void	nd6_setmtu __P((struct ifnet *));
-#endif
-
 struct if_clone *if_clone_lookup __P((const char *, int *));
 int if_clone_list __P((struct if_clonereq *));
 

diff --git a/netbsd/sys/net/if.c b/netbsd/sys/net/if.c
@@ -132,22 +132,14 @@
 #endif
 
 #ifdef INET6
-/*XXX*/
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
 #endif
 
 int	ifqmaxlen = IFQ_MAXLEN;
 struct	callout if_slowtimo_ch;
 
-#ifdef INET6
-/*
- * XXX: declare here to avoid to include many inet6 related files..
- * should be more generalized?
- */
-extern void nd6_setmtu __P((struct ifnet *));
-#endif 
-
 int	if_rt_walktree __P((struct radix_node *, void *));
 
 struct if_clone *if_clone_lookup __P((const char *, int *));

diff --git a/openbsd/sys/net/if.c b/openbsd/sys/net/if.c
@@ -98,6 +98,7 @@
 #include <netinet/in.h>
 #endif
 #include <netinet6/in6_ifattach.h>
+#include <netinet6/nd6.h>
 #endif
 
 #if NBPFILTER > 0
@@ -120,14 +121,6 @@ void	if_detached_start(struct ifnet *);
 int	if_detached_ioctl(struct ifnet *, u_long, caddr_t);
 void	if_detached_watchdog(struct ifnet *);
 
-#ifdef INET6
-/*
- * XXX: declare here to avoid to include many inet6 related files..
- * should be more generalized?
- */
-extern void nd6_setmtu(struct ifnet *);
-#endif 
-
 /*
  * Network interface utility routines.
  *