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/netinet/ip_input.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- src/sys/netinet/ip_input.c	2012/06/22 14:54:35	1.301
+++ src/sys/netinet/ip_input.c	2012/06/25 15:28:39	1.302
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.301 2012/06/22 14:54:35 christos Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.302 2012/06/25 15:28:39 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.301 2012/06/22 14:54:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.302 2012/06/25 15:28:39 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -139,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_input.c,v
 #ifdef MROUTING
 #include <netinet/ip_mroute.h>
 #endif
-#include <netinet/rfc6056.h>
+#include <netinet/portalgo.h>
 
 #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>
@@ -1889,24 +1889,24 @@ sysctl_net_inet_ip_setup(struct sysctllo
 		       CTL_EOL);
 
 	/* anonportalgo RFC6056 subtree */
-	const struct sysctlnode *rfc6056_node;
-	sysctl_createv(clog, 0, NULL, &rfc6056_node,
+	const struct sysctlnode *portalgo_node;
+	sysctl_createv(clog, 0, NULL, &portalgo_node,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "anonportalgo",
 		       SYSCTL_DESCR("Anonymous Port Algorithm Selection (RFC 6056)"),
 	    	       NULL, 0, NULL, 0,
 		       CTL_NET, PF_INET, IPPROTO_IP, CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &rfc6056_node, NULL,
+	sysctl_createv(clog, 0, &portalgo_node, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRING, "available",
 		       SYSCTL_DESCR("available algorithms"),
-		       sysctl_rfc6056_available, 0, NULL, RFC6056_MAXLEN,
+		       sysctl_portalgo_available, 0, NULL, PORTALGO_MAXLEN,
 		       CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &rfc6056_node, NULL,
+	sysctl_createv(clog, 0, &portalgo_node, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_STRING, "selected",
 		       SYSCTL_DESCR("selected algorithm"),
-		       sysctl_rfc6056_selected, 0, NULL, RFC6056_MAXLEN,
+		       sysctl_portalgo_selected, 0, NULL, PORTALGO_MAXLEN,
 		       CTL_CREATE, CTL_EOL);
 }