Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.129.4.2
retrieving revision 1.130
diff -u -p -r1.129.4.2 -r1.130
--- src/sys/netinet6/ip6_input.c	2011/06/12 00:24:30	1.129.4.2
+++ src/sys/netinet6/ip6_input.c	2011/05/03 18:28:45	1.130
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.129.4.2 2011/06/12 00:24:30 rmind Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.130 2011/05/03 18:28:45 dyoung Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.129.4.2 2011/06/12 00:24:30 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.130 2011/05/03 18:28:45 dyoung Exp $");
 
 #include "opt_gateway.h"
 #include "opt_inet.h"
@@ -138,6 +138,8 @@ __KERNEL_RCSID(0, "$NetBSD: ip6_input.c,
 
 #include <net/net_osdep.h>
 
+extern  struct inpcbtable tcbtable; /* XXX include of tcp_var.h no good */
+
 extern struct domain inet6domain;
 
 u_char ip6_protox[IPPROTO_MAX];
@@ -1793,20 +1795,6 @@ sysctl_net_inet6_ip6_setup(struct sysctl
 		       IPV6CTL_ACCEPT_RTADV, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-		       CTLTYPE_INT, "rtadv_maxroutes",
-		       SYSCTL_DESCR("Maximum number of routes accepted via router advertisements"),
-		       NULL, 0, &ip6_rtadv_maxroutes, 0,
-		       CTL_NET, PF_INET6, IPPROTO_IPV6,
-		       IPV6CTL_RTADV_MAXROUTES, CTL_EOL);
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_INT, "rtadv_numroutes",
-		       SYSCTL_DESCR("Current number of routes accepted via router advertisements"),
-		       NULL, 0, &nd6_numroutes, 0,
-		       CTL_NET, PF_INET6, IPPROTO_IPV6,
-		       IPV6CTL_RTADV_NUMROUTES, CTL_EOL);
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_INT, "keepfaith",
 		       SYSCTL_DESCR("Activate faith interface"),
 		       NULL, 0, &ip6_keepfaith, 0,