diff options
author | John Baldwin <jhb@FreeBSD.org> | 2014-02-25 18:44:33 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2014-02-25 18:44:33 +0000 |
commit | 5b26ea5df36c3dcddbdcb8cc7a283873721bb64a (patch) | |
tree | 34801d5ef19a32be547f8227f92bc964076b0527 /sys | |
parent | eff68496e2d8dedfe47e4b711681fe4995cf3abd (diff) | |
download | src-5b26ea5df36c3dcddbdcb8cc7a283873721bb64a.tar.gz src-5b26ea5df36c3dcddbdcb8cc7a283873721bb64a.zip |
Remove more constants related to static sysctl nodes. The MAXID constants
were primarily used to size the sysctl name list macros that were removed
in r254295. A few other constants either did not have an associated
sysctl node, or the associated node used OID_AUTO instead.
PR: ports/184525 (exp-run)
Notes
Notes:
svn path=/head/; revision=262489
Diffstat (limited to 'sys')
-rw-r--r-- | sys/net/if_pfsync.h | 6 | ||||
-rw-r--r-- | sys/netinet/icmp_var.h | 3 | ||||
-rw-r--r-- | sys/netinet/igmp_var.h | 3 | ||||
-rw-r--r-- | sys/netinet/in.h | 10 | ||||
-rw-r--r-- | sys/netinet/pim_var.h | 3 | ||||
-rw-r--r-- | sys/netinet/tcp_var.h | 4 | ||||
-rw-r--r-- | sys/netinet/udp_var.h | 3 | ||||
-rw-r--r-- | sys/netinet6/pim6_var.h | 3 | ||||
-rw-r--r-- | sys/netipsec/ipsec.h | 4 | ||||
-rw-r--r-- | sys/netipsec/key_var.h | 1 | ||||
-rw-r--r-- | sys/sys/socket.h | 5 | ||||
-rw-r--r-- | sys/sys/sysctl.h | 4 |
12 files changed, 8 insertions, 41 deletions
diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h index 7a72bbbee560..5c4ba631d794 100644 --- a/sys/net/if_pfsync.h +++ b/sys/net/if_pfsync.h @@ -205,12 +205,6 @@ struct pfsync_tdb { #define PFSYNC_HDRLEN sizeof(struct pfsync_header) -/* - * Names for PFSYNC sysctl objects - */ -#define PFSYNCCTL_STATS 1 /* PFSYNC stats */ -#define PFSYNCCTL_MAXID 2 - struct pfsyncstats { u_int64_t pfsyncs_ipackets; /* total input packets, IPv4 */ u_int64_t pfsyncs_ipackets6; /* total input packets, IPv6 */ diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index ae869e67e402..d3e72bc2823e 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -78,12 +78,11 @@ void kmod_icmpstat_inc(int statnum); #endif /* - * Names for ICMP sysctl objects + * Identifiers for ICMP sysctl nodes */ #define ICMPCTL_MASKREPL 1 /* allow replies to netmask requests */ #define ICMPCTL_STATS 2 /* statistics (read-only) */ #define ICMPCTL_ICMPLIM 3 -#define ICMPCTL_MAXID 4 #ifdef _KERNEL SYSCTL_DECL(_net_inet_icmp); diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h index cd10d7fb694d..8d91cc146a61 100644 --- a/sys/netinet/igmp_var.h +++ b/sys/netinet/igmp_var.h @@ -213,9 +213,8 @@ SYSCTL_DECL(_net_inet_igmp); #endif /* _KERNEL */ /* - * Names for IGMP sysctl objects + * Identifiers for IGMP sysctl nodes */ #define IGMPCTL_STATS 1 /* statistics (read-only) */ -#define IGMPCTL_MAXID 2 #endif diff --git a/sys/netinet/in.h b/sys/netinet/in.h index e59c07c8e7ab..d5fc89c84c62 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -602,14 +602,7 @@ int getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, #define IP_PORTRANGE_LOW 2 /* "low" - vouchsafe security */ /* - * Definitions for inet sysctl operations. - * - * Third level is protocol number. - * Fourth level is desired variable within that protocol. - */ - -/* - * Names for IP sysctl objects + * Identifiers for IP sysctl nodes */ #define IPCTL_FORWARDING 1 /* act as router */ #define IPCTL_SENDREDIRECTS 2 /* may send redirects when forwarding */ @@ -629,7 +622,6 @@ int getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, #define IPCTL_FASTFORWARDING 14 /* use fast IP forwarding code */ #define IPCTL_KEEPFAITH 15 /* FAITH IPv4->IPv6 translater ctl */ #define IPCTL_GIF_TTL 16 /* default TTL for gif encap packet */ -#define IPCTL_MAXID 17 #endif /* __BSD_VISIBLE */ diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h index d082d9a31459..d7c4493dad3f 100644 --- a/sys/netinet/pim_var.h +++ b/sys/netinet/pim_var.h @@ -66,10 +66,9 @@ struct pimstat { #endif /* - * Names for PIM sysctl objects + * Identifiers for PIM sysctl nodes */ #define PIMCTL_STATS 1 /* statistics (read-only) */ -#define PIMCTL_MAXID 2 #ifdef _KERNEL diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index e3197e5406e2..c23fa1da58d0 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -576,7 +576,7 @@ struct xtcpcb { #endif /* - * Names for TCP sysctl objects + * Identifiers for TCP sysctl nodes */ #define TCPCTL_DO_RFC1323 1 /* use RFC-1323 extensions */ #define TCPCTL_MSSDFLT 3 /* MSS default */ @@ -592,8 +592,6 @@ struct xtcpcb { #define TCPCTL_V6MSSDFLT 13 /* MSS default for IPv6 */ #define TCPCTL_SACK 14 /* Selective Acknowledgement,rfc 2018 */ #define TCPCTL_DROP 15 /* drop tcp connection */ -#define TCPCTL_MAXID 16 -#define TCPCTL_FINWAIT2_TIMEOUT 17 #ifdef _KERNEL #ifdef SYSCTL_DECL diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 91a98f6c2b8a..e55db5faf4ba 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -115,14 +115,13 @@ void kmod_udpstat_inc(int statnum); #endif /* - * Names for UDP sysctl objects. + * Identifiers for UDP sysctl nodes. */ #define UDPCTL_CHECKSUM 1 /* checksum UDP packets */ #define UDPCTL_STATS 2 /* statistics (read-only) */ #define UDPCTL_MAXDGRAM 3 /* max datagram size */ #define UDPCTL_RECVSPACE 4 /* default receive buffer space */ #define UDPCTL_PCBLIST 5 /* list of PCBs for UDP sockets */ -#define UDPCTL_MAXID 6 #ifdef _KERNEL SYSCTL_DECL(_net_inet_udp); diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h index 4842208f174d..7f9262bbc75d 100644 --- a/sys/netinet6/pim6_var.h +++ b/sys/netinet6/pim6_var.h @@ -56,9 +56,8 @@ int pim6_input(struct mbuf **, int*, int); #endif /* KERNEL */ /* - * Names for PIM sysctl objects + * Identifiers for PIM sysctl nodes */ #define PIM6CTL_STATS 1 /* statistics (read-only) */ -#define PIM6CTL_MAXID 2 #endif /* _NETINET6_PIM6_VAR_H_ */ diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 240083ab6597..24e2543d0b8c 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -244,9 +244,6 @@ struct ipsecstat { /* * Definitions for IPsec & Key sysctl operations. */ -/* - * Names for IPsec & Key sysctl objects - */ #define IPSECCTL_STATS 1 /* stats */ #define IPSECCTL_DEF_POLICY 2 #define IPSECCTL_DEF_ESP_TRANSLEV 3 /* int; ESP transport mode */ @@ -262,7 +259,6 @@ struct ipsecstat { #define IPSECCTL_ECN 11 #define IPSECCTL_DEBUG 12 #define IPSECCTL_ESP_RANDPAD 13 -#define IPSECCTL_MAXID 14 #ifdef _KERNEL #include <sys/counter.h> diff --git a/sys/netipsec/key_var.h b/sys/netipsec/key_var.h index 2601ece8fdc9..ecef2360c2bf 100644 --- a/sys/netipsec/key_var.h +++ b/sys/netipsec/key_var.h @@ -46,7 +46,6 @@ #define KEYCTL_ESP_AUTH 10 #define KEYCTL_AH_KEYMIN 11 #define KEYCTL_PREFERED_OLDSA 12 -#define KEYCTL_MAXID 13 #ifdef _KERNEL #define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0])) diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 25ff9bf3ef28..cc43fa21dc09 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -376,9 +376,8 @@ struct sockproto { * Second level is protocol family. * Third level is protocol number. * - * Further levels are defined by the individual families below. + * Further levels are defined by the individual families. */ -#define NET_MAXID AF_MAX /* * PF_ROUTE - Routing table @@ -394,8 +393,6 @@ struct sockproto { #define NET_RT_IFMALIST 4 /* return multicast address list */ #define NET_RT_IFLISTL 5 /* Survey interface list, using 'l'en * versions of msghdr structs. */ -#define NET_RT_MAXID 6 - #endif /* __BSD_VISIBLE */ /* diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 45ae3a2e4147..62469978d255 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -481,7 +481,6 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; ); #define CTL_MACHDEP 7 /* machine dependent */ #define CTL_USER 8 /* user-level */ #define CTL_P1003_1B 9 /* POSIX 1003.1B */ -#define CTL_MAXID 10 /* number of valid top-level ids */ /* * CTL_KERN identifiers @@ -523,7 +522,6 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; ); #define KERN_IOV_MAX 35 /* int: value of UIO_MAXIOV */ #define KERN_HOSTUUID 36 /* string: host UUID identifier */ #define KERN_ARND 37 /* int: from arc4rand() */ -#define KERN_MAXID 38 /* number of valid kern ids */ /* * KERN_PROC subtypes */ @@ -585,7 +583,6 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; ); #define HW_FLOATINGPT 10 /* int: has HW floating point? */ #define HW_MACHINE_ARCH 11 /* string: machine architecture */ #define HW_REALMEM 12 /* int: 'real' memory */ -#define HW_MAXID 13 /* number of valid hw ids */ /* * CTL_USER definitions @@ -610,7 +607,6 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; ); #define USER_POSIX2_UPE 18 /* int: POSIX2_UPE */ #define USER_STREAM_MAX 19 /* int: POSIX2_STREAM_MAX */ #define USER_TZNAME_MAX 20 /* int: POSIX2_TZNAME_MAX */ -#define USER_MAXID 21 /* number of valid user ids */ #define CTL_P1003_1B_ASYNCHRONOUS_IO 1 /* boolean */ #define CTL_P1003_1B_MAPPED_FILES 2 /* boolean */ |