[src/trunk]: src/sys/netipsec Remove the

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/93487d3d81e5
branches:  trunk
changeset: 361220:93487d3d81e5
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Apr 18 06:13:23 2018 +0000

description:
Remove the

        net.inet6.esp6
        net.inet6.ipcomp6
        net.inet6.ah6

subtrees. They are aliases to net.inet6.ipsec6, but they are not
consistent with the original intended naming. (eg there was
net.inet6.esp6.esp_trans_deflev instead of net.inet6.esp6.trans_deflev).

diffstat:

 sys/netipsec/ipsec_netbsd.c |  22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diffs (42 lines):

diff -r 4c80dda5b2d6 -r 93487d3d81e5 sys/netipsec/ipsec_netbsd.c
--- a/sys/netipsec/ipsec_netbsd.c       Wed Apr 18 06:04:03 2018 +0000
+++ b/sys/netipsec/ipsec_netbsd.c       Wed Apr 18 06:13:23 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_netbsd.c,v 1.48 2018/04/18 06:03:36 maxv Exp $   */
+/*     $NetBSD: ipsec_netbsd.c,v 1.49 2018/04/18 06:13:23 maxv Exp $   */
 /*     $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $      */
 /*     $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $       */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.48 2018/04/18 06:03:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_netbsd.c,v 1.49 2018/04/18 06:13:23 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -789,23 +789,5 @@
                       NULL, 0, &ipsec_used, 0,
                       CTL_NET, PF_INET6, IPPROTO_AH,
                       CTL_CREATE, CTL_EOL);
-       /*
-        * "aliases" for the ipsec6 subtree
-        */
-       sysctl_createv(clog, 0, NULL, NULL,
-                      CTLFLAG_PERMANENT|CTLFLAG_ALIAS,
-                      CTLTYPE_NODE, "esp6", NULL,
-                      NULL, IPPROTO_AH, NULL, 0,
-                      CTL_NET, PF_INET6, IPPROTO_ESP, CTL_EOL);
-       sysctl_createv(clog, 0, NULL, NULL,
-                      CTLFLAG_PERMANENT|CTLFLAG_ALIAS,
-                      CTLTYPE_NODE, "ipcomp6", NULL,
-                      NULL, IPPROTO_AH, NULL, 0,
-                      CTL_NET, PF_INET6, IPPROTO_IPCOMP, CTL_EOL);
-       sysctl_createv(clog, 0, NULL, NULL,
-                      CTLFLAG_PERMANENT|CTLFLAG_ALIAS,
-                      CTLTYPE_NODE, "ah6", NULL,
-                      NULL, IPPROTO_AH, NULL, 0,
-                      CTL_NET, PF_INET6, CTL_CREATE, CTL_EOL);
 }
 #endif /* INET6 */