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.98.6.1
retrieving revision 1.99
diff -u -p -r1.98.6.1 -r1.99
--- src/sys/netinet6/ip6_input.c	2007/03/29 19:28:00	1.98.6.1
+++ src/sys/netinet6/ip6_input.c	2007/03/23 14:24:22	1.99
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.98.6.1 2007/03/29 19:28:00 reinoud Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.99 2007/03/23 14:24:22 liamjfoy 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.98.6.1 2007/03/29 19:28:00 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.99 2007/03/23 14:24:22 liamjfoy Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1611,12 +1611,12 @@ ip6_delaux(m)
  * we could reduce this value, call ip6flow_reap();
  */
 static int
-sysctl_net_inet6_ip6_maxflows(SYSCTLFN_ARGS)
+sysctl_net_inet_ip6_maxflows(SYSCTLFN_ARGS)
 {  
         int s;
   
         s = sysctl_lookup(SYSCTLFN_CALL(rnode));
-        if (s || newp == NULL)
+        if (s)
                 return (s);
  
         s = splsoftnet();
@@ -1944,7 +1944,7 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup,
 			CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 			CTLTYPE_INT, "maxflows",
 			SYSCTL_DESCR("Number of flows for fast forwarding (IPv6)"),
-			sysctl_net_inet6_ip6_maxflows, 0, &ip6_maxflows, 0,
+			sysctl_net_inet_ip6_maxflows, 0, &ip6_maxflows, 0,
 			CTL_NET, PF_INET6, IPPROTO_IPV6,
 			CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,