diff options
-rw-r--r-- | sys/netinet/icmp6.h | 24 | ||||
-rw-r--r-- | sys/netkey/key_var.h | 18 |
2 files changed, 1 insertions, 41 deletions
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 3154c09..5d7ca8b 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -625,30 +625,6 @@ struct icmp6stat { #define ICMPV6CTL_ND6_PRLIST 20 #define ICMPV6CTL_MAXID 21 -#define ICMPV6CTL_NAMES { \ - { 0, 0 }, \ - { 0, 0 }, \ - { "rediraccept", CTLTYPE_INT }, \ - { "redirtimeout", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "nd6_prune", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "nd6_delay", CTLTYPE_INT }, \ - { "nd6_umaxtries", CTLTYPE_INT }, \ - { "nd6_mmaxtries", CTLTYPE_INT }, \ - { "nd6_useloopback", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "nodeinfo", CTLTYPE_INT }, \ - { "errppslimit", CTLTYPE_INT }, \ - { "nd6_maxnudhint", CTLTYPE_INT }, \ - { "mtudisc_hiwat", CTLTYPE_INT }, \ - { "mtudisc_lowat", CTLTYPE_INT }, \ - { "nd6_debug", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ -} - #define RTF_PROBEMTU RTF_PROTO1 #ifdef _KERNEL diff --git a/sys/netkey/key_var.h b/sys/netkey/key_var.h index 910fda1..9c8d1d4 100644 --- a/sys/netkey/key_var.h +++ b/sys/netkey/key_var.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $ */ +/* $KAME: key_var.h,v 1.12 2001/11/06 03:48:29 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -48,22 +48,6 @@ #define KEYCTL_PREFERED_OLDSA 12 #define KEYCTL_MAXID 13 -#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 }, \ -} - #ifdef _KERNEL #define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0])) #define _KEYLEN(key) ((u_int)((key)->sadb_key_bits >> 3)) |