[src/trunk]: src/sys/netipsec Remove unused macros.

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

details:   https://anonhg.NetBSD.org/src/rev/a1987da887c6
branches:  trunk
changeset: 832062:a1987da887c6
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Apr 28 13:23:17 2018 +0000

description:
Remove unused macros.

diffstat:

 sys/netipsec/ipsec_var.h |  39 +--------------------------------------
 sys/netipsec/key_var.h   |  34 +---------------------------------
 2 files changed, 2 insertions(+), 71 deletions(-)

diffs (106 lines):

diff -r 6b44844e5365 -r a1987da887c6 sys/netipsec/ipsec_var.h
--- a/sys/netipsec/ipsec_var.h  Sat Apr 28 12:45:03 2018 +0000
+++ b/sys/netipsec/ipsec_var.h  Sat Apr 28 13:23:17 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_var.h,v 1.6 2018/04/19 08:27:38 maxv Exp $ */
+/*     $NetBSD: ipsec_var.h,v 1.7 2018/04/28 13:23:17 maxv Exp $ */
 /*     $FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $       */
 
 /*-
@@ -56,9 +56,6 @@
 #define        IPSEC_NSTATS            16
 
 /*
- * Definitions for IPsec & Key sysctl operations.
- */
-/*
  * Names for IPsec & Key sysctl objects
  */
 #define IPSECCTL_STATS                 1       /* KAME compat stats */
@@ -78,38 +75,4 @@
 #define        IPSECCTL_ESP_RANDPAD            13
 #define IPSECCTL_MAXID                 14
 
-#define IPSECCTL_NAMES { \
-       { 0, 0 }, \
-       { 0, 0 }, \
-       { "def_policy", CTLTYPE_INT }, \
-       { "esp_trans_deflev", CTLTYPE_INT }, \
-       { "esp_net_deflev", CTLTYPE_INT }, \
-       { "ah_trans_deflev", CTLTYPE_INT }, \
-       { "ah_net_deflev", CTLTYPE_INT }, \
-       { 0, 0 }, \
-       { "ah_cleartos", CTLTYPE_INT }, \
-       { "ah_offsetmask", CTLTYPE_INT }, \
-       { "dfbit", CTLTYPE_INT }, \
-       { "ecn", CTLTYPE_INT }, \
-       { "debug", CTLTYPE_INT }, \
-       { "esp_randpad", CTLTYPE_INT }, \
-}
-
-#define IPSEC6CTL_NAMES { \
-       { 0, 0 }, \
-       { 0, 0 }, \
-       { "def_policy", CTLTYPE_INT }, \
-       { "esp_trans_deflev", CTLTYPE_INT }, \
-       { "esp_net_deflev", CTLTYPE_INT }, \
-       { "ah_trans_deflev", CTLTYPE_INT }, \
-       { "ah_net_deflev", CTLTYPE_INT }, \
-       { 0, 0 }, \
-       { 0, 0 }, \
-       { 0, 0 }, \
-       { 0, 0 }, \
-       { "ecn", CTLTYPE_INT }, \
-       { "debug", CTLTYPE_INT }, \
-       { "esp_randpad", CTLTYPE_INT }, \
-}
-
 #endif /* !_NETIPSEC_IPSEC_VAR_H_ */
diff -r 6b44844e5365 -r a1987da887c6 sys/netipsec/key_var.h
--- a/sys/netipsec/key_var.h    Sat Apr 28 12:45:03 2018 +0000
+++ b/sys/netipsec/key_var.h    Sat Apr 28 13:23:17 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key_var.h,v 1.4 2018/04/19 08:27:38 maxv Exp $ */
+/*     $NetBSD: key_var.h,v 1.5 2018/04/28 13:23:17 maxv Exp $ */
 /*     $FreeBSD: key_var.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $     */
 /*     $KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $        */
 
@@ -51,38 +51,6 @@
 #define KEYCTL_DUMPSP                  14
 #define KEYCTL_MAXID                   15
 
-#define KEYCTL_NAMES { \
-       { 0, 0 }, \
-       { "debug", CTLTYPE_INT }, \
-       { "spi_try", CTLTYPE_INT }, \
-       { "spi_min_value", CTLTYPE_INT }, \
-       { "spi_max_value", CTLTYPE_INT }, \
-       { "random_int", CTLTYPE_INT }, \
-       { "larval_lifetime", CTLTYPE_INT }, \
-       { "blockacq_count", CTLTYPE_INT }, \
-       { "blockacq_lifetime", CTLTYPE_INT }, \
-       { "esp_keymin", CTLTYPE_INT }, \
-       { "esp_auth", CTLTYPE_INT }, \
-       { "ah_keymin", CTLTYPE_INT }, \
-       { "prefered_oldsa", CTLTYPE_INT }, \
-}
-
-#define KEYCTL_VARS { \
-       0, \
-       0, \
-       &key_spi_trycnt, \
-       &key_spi_minval, \
-       &key_spi_maxval, \
-       &key_int_random, \
-       &key_larval_lifetime, \
-       &key_blockacq_count, \
-       &key_blockacq_lifetime, \
-       &ipsec_esp_keymin, \
-       &ipsec_esp_auth, \
-       &ipsec_ah_keymin, \
-       &key_prefered_oldsa, \
-}
-
 #ifdef _KERNEL
 #define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
 #define _KEYLEN(key) ((u_int)((key)->sadb_key_bits >> 3))