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/udp_usrreq.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- src/sys/netinet/udp_usrreq.c	2012/03/22 20:34:39	1.186
+++ src/sys/netinet/udp_usrreq.c	2012/06/22 14:54:35	1.187
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.186 2012/03/22 20:34:39 drochner Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.187 2012/06/22 14:54:35 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.186 2012/03/22 20:34:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.187 2012/06/22 14:54:35 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -96,7 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/udp_private.h>
-#include <netinet/rfc6056.h>
 
 #ifdef INET6
 #include <netinet/ip6.h>
@@ -1080,15 +1079,6 @@ udp_ctloutput(int op, struct socket *so,
 			}
 			break;
 		
-		case UDP_RFC6056ALGO:
-			error = sockopt_getint(sopt, &optval);
-			if (error)
-				break;
-
-			error = rfc6056_algo_index_select(
-			    (struct inpcb_hdr *)inp, optval);
-			break;
-
 		default:
 			error = ENOPROTOOPT;
 			break;
@@ -1377,8 +1367,6 @@ sysctl_net_inet_udp_stats(SYSCTLFN_ARGS)
 static void
 sysctl_net_inet_udp_setup(struct sysctllog **clog)
 {
-	const struct sysctlnode *rfc6056_node;
-	
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "net", NULL,
@@ -1438,25 +1426,6 @@ sysctl_net_inet_udp_setup(struct sysctll
 		       sysctl_net_inet_udp_stats, 0, NULL, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS,
 		       CTL_EOL);
-	/* RFC6056 subtree */
-	sysctl_createv(clog, 0, NULL, &rfc6056_node,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "rfc6056",
-		       SYSCTL_DESCR("RFC 6056"),
-	    	       NULL, 0, NULL, 0,
-		       CTL_NET, PF_INET, IPPROTO_UDP, CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &rfc6056_node, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_STRING, "available",
-		       SYSCTL_DESCR("RFC 6056 available algorithms"),
-		       sysctl_rfc6056_available, 0, NULL, RFC6056_MAXLEN,
-		       CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, &rfc6056_node, NULL,
-		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-		       CTLTYPE_STRING, "selected",
-		       SYSCTL_DESCR("RFC 6056 selected algorithm"),
-		       sysctl_rfc6056_selected, 0, NULL, RFC6056_MAXLEN,
-		       CTL_CREATE, CTL_EOL);
 }
 #endif