[src/trunk]: src/sys/netipsec Remove some more FreeBSD sysctl declarations th...

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

details:   https://anonhg.NetBSD.org/src/rev/73dab2f8b68a
branches:  trunk
changeset: 829880:73dab2f8b68a
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Feb 16 09:07:50 2018 +0000

description:
Remove some more FreeBSD sysctl declarations that already have NetBSD
counterparts. Discussed with ozaki-r@.

diffstat:

 sys/netipsec/ipsec.c        |  10 ++--------
 sys/netipsec/xform_ah.c     |   8 ++------
 sys/netipsec/xform_esp.c    |   6 ++----
 sys/netipsec/xform_ipcomp.c |   6 ++----
 4 files changed, 8 insertions(+), 22 deletions(-)

diffs (114 lines):

diff -r 477b7469c905 -r 73dab2f8b68a sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Fri Feb 16 08:56:50 2018 +0000
+++ b/sys/netipsec/ipsec.c      Fri Feb 16 09:07:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.127 2018/02/16 08:56:50 maxv Exp $ */
+/*     $NetBSD: ipsec.c,v 1.128 2018/02/16 09:07:50 maxv Exp $ */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $       */
 /*     $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.127 2018/02/16 08:56:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.128 2018/02/16 09:07:50 maxv Exp $");
 
 /*
  * IPsec controller part.
@@ -160,12 +160,6 @@
 static struct secpolicy *ipsec_getpolicybysock(struct mbuf *, u_int,
     struct inpcb_hdr *, int *);
 
-#ifdef __FreeBSD__
-/* net.inet.ipsec */
-SYSCTL_INT(_net_inet_ipsec, OID_AUTO,
-       crypto_support, CTLFLAG_RW,     &crypto_support,0, "");
-#endif /* __FreeBSD__ */
-
 #ifdef INET6
 int ip6_esp_trans_deflev = IPSEC_LEVEL_USE;
 int ip6_esp_net_deflev = IPSEC_LEVEL_USE;
diff -r 477b7469c905 -r 73dab2f8b68a sys/netipsec/xform_ah.c
--- a/sys/netipsec/xform_ah.c   Fri Feb 16 08:56:50 2018 +0000
+++ b/sys/netipsec/xform_ah.c   Fri Feb 16 09:07:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ah.c,v 1.84 2018/02/15 09:23:47 ozaki-r Exp $    */
+/*     $NetBSD: xform_ah.c,v 1.85 2018/02/16 09:07:50 maxv Exp $       */
 /*     $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $   */
 /*     $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.84 2018/02/15 09:23:47 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.85 2018/02/16 09:07:50 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -108,10 +108,6 @@
 SYSCTL_DECL(_net_inet_ah);
 SYSCTL_INT(_net_inet_ah, OID_AUTO,
        ah_enable,      CTLFLAG_RW,     &ah_enable,     0, "");
-SYSCTL_INT(_net_inet_ah, OID_AUTO,
-       ah_cleartos,    CTLFLAG_RW,     &ip4_ah_cleartos,       0, "");
-SYSCTL_STRUCT(_net_inet_ah, IPSECCTL_STATS,
-       stats,          CTLFLAG_RD,     &ahstat,        ahstat, "");
 #endif /* __FreeBSD__ */
 
 static unsigned char ipseczeroes[256]; /* larger than an ip6 extension hdr */
diff -r 477b7469c905 -r 73dab2f8b68a sys/netipsec/xform_esp.c
--- a/sys/netipsec/xform_esp.c  Fri Feb 16 08:56:50 2018 +0000
+++ b/sys/netipsec/xform_esp.c  Fri Feb 16 09:07:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_esp.c,v 1.77 2018/02/15 12:40:12 maxv Exp $      */
+/*     $NetBSD: xform_esp.c,v 1.78 2018/02/16 09:07:50 maxv Exp $      */
 /*     $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.77 2018/02/15 12:40:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.78 2018/02/16 09:07:50 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -93,8 +93,6 @@
 SYSCTL_DECL(_net_inet_esp);
 SYSCTL_INT(_net_inet_esp, OID_AUTO,
        esp_enable,     CTLFLAG_RW,     &esp_enable,    0, "");
-SYSCTL_STRUCT(_net_inet_esp, IPSECCTL_STATS,
-       stats,          CTLFLAG_RD,     &espstat,       espstat, "");
 #endif /* __FreeBSD__ */
 
 static int esp_max_ivlen;              /* max iv length over all algorithms */
diff -r 477b7469c905 -r 73dab2f8b68a sys/netipsec/xform_ipcomp.c
--- a/sys/netipsec/xform_ipcomp.c       Fri Feb 16 08:56:50 2018 +0000
+++ b/sys/netipsec/xform_ipcomp.c       Fri Feb 16 09:07:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipcomp.c,v 1.57 2018/02/15 13:51:32 maxv Exp $   */
+/*     $NetBSD: xform_ipcomp.c,v 1.58 2018/02/16 09:07:50 maxv Exp $   */
 /*     $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $       */
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.57 2018/02/15 13:51:32 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.58 2018/02/16 09:07:50 maxv Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #if defined(_KERNEL_OPT)
@@ -80,8 +80,6 @@
 SYSCTL_DECL(_net_inet_ipcomp);
 SYSCTL_INT(_net_inet_ipcomp, OID_AUTO,
        ipcomp_enable,  CTLFLAG_RW,     &ipcomp_enable, 0, "");
-SYSCTL_STRUCT(_net_inet_ipcomp, IPSECCTL_STATS,
-       stats,          CTLFLAG_RD,     &ipcompstat,    ipcompstat, "");
 #endif /* __FreeBSD__ */
 
 static int ipcomp_input_cb(struct cryptop *crp);