- Get rid of unsused constants for sysctl variables.

- Fix panic from mutex unlock on freed lock when ASCONF-ACK
  aborts an assoc
- Fix panic from addr lock recursion when ASCONFs are queued
  in the front states
- ASCONFs "queued" in the front states should really be
  bundled after the COOKIE-ACK, not in front of it
- Fix issue with addresses deleted in the front states from
  being sent with ASCONF(DELETE)-- replaced
  sctp_asconf_queue_add_sa() with delete specific function
- Comment change in sctp.h the drafts are now RFC's
Approved by:	re@freebsd.org (B Mah)

1 files changed, 0 insertions, 56 deletions

diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 15d9798..3b93b68 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -41,385 +41,330 @@ __FBSDID("$FreeBSD$");
  * limits for the sysctl variables
  */
 /* maxdgram: Maximum outgoing SCTP buffer size */
-#define SCTPCTL_MAXDGRAM		1
 #define SCTPCTL_MAXDGRAM_DESC		"Maximum outgoing SCTP buffer size"
 #define SCTPCTL_MAXDGRAM_MIN		0
 #define SCTPCTL_MAXDGRAM_MAX		0xFFFFFFFF
 #define SCTPCTL_MAXDGRAM_DEFAULT	262144	/* 256k */
 
 /* recvspace: Maximum incoming SCTP buffer size */
-#define SCTPCTL_RECVSPACE		2
 #define SCTPCTL_RECVSPACE_DESC		"Maximum incoming SCTP buffer size"
 #define SCTPCTL_RECVSPACE_MIN		0
 #define SCTPCTL_RECVSPACE_MAX		0xFFFFFFFF
 #define SCTPCTL_RECVSPACE_DEFAULT	262144	/* 256k */
 
 /* autoasconf: Enable SCTP Auto-ASCONF */
-#define SCTPCTL_AUTOASCONF		3
 #define SCTPCTL_AUTOASCONF_DESC		"Enable SCTP Auto-ASCONF"
 #define SCTPCTL_AUTOASCONF_MIN		0
 #define SCTPCTL_AUTOASCONF_MAX		1
 #define SCTPCTL_AUTOASCONF_DEFAULT	SCTP_DEFAULT_AUTO_ASCONF
 
 /* ecn_enable: Enable SCTP ECN */
-#define SCTPCTL_ECN_ENABLE		4
 #define SCTPCTL_ECN_ENABLE_DESC		"Enable SCTP ECN"
 #define SCTPCTL_ECN_ENABLE_MIN		0
 #define SCTPCTL_ECN_ENABLE_MAX		1
 #define SCTPCTL_ECN_ENABLE_DEFAULT	1
 
 /* ecn_nonce: Enable SCTP ECN Nonce */
-#define SCTPCTL_ECN_NONCE		5
 #define SCTPCTL_ECN_NONCE_DESC		"Enable SCTP ECN Nonce"
 #define SCTPCTL_ECN_NONCE_MIN		0
 #define SCTPCTL_ECN_NONCE_MAX		1
 #define SCTPCTL_ECN_NONCE_DEFAULT	0
 
 /* strict_sacks: Enable SCTP Strict SACK checking */
-#define SCTPCTL_STRICT_SACKS		6
 #define SCTPCTL_STRICT_SACKS_DESC	"Enable SCTP Strict SACK checking"
 #define SCTPCTL_STRICT_SACKS_MIN	0
 #define SCTPCTL_STRICT_SACKS_MAX	1
 #define SCTPCTL_STRICT_SACKS_DEFAULT	0
 
 /* loopback_nocsum: Enable NO Csum on packets sent on loopback */
-#define SCTPCTL_LOOPBACK_NOCSUM		7
 #define SCTPCTL_LOOPBACK_NOCSUM_DESC	"Enable NO Csum on packets sent on loopback"
 #define SCTPCTL_LOOPBACK_NOCSUM_MIN	0
 #define SCTPCTL_LOOPBACK_NOCSUM_MAX	1
 #define SCTPCTL_LOOPBACK_NOCSUM_DEFAULT	1
 
 /* strict_init: Enable strict INIT/INIT-ACK singleton enforcement */
-#define SCTPCTL_STRICT_INIT		8
 #define SCTPCTL_STRICT_INIT_DESC	"Enable strict INIT/INIT-ACK singleton enforcement"
 #define SCTPCTL_STRICT_INIT_MIN		0
 #define SCTPCTL_STRICT_INIT_MAX		1
 #define SCTPCTL_STRICT_INIT_DEFAULT	1
 
 /* peer_chkoh: Amount to debit peers rwnd per chunk sent */
-#define SCTPCTL_PEER_CHKOH		9
 #define SCTPCTL_PEER_CHKOH_DESC		"Amount to debit peers rwnd per chunk sent"
 #define SCTPCTL_PEER_CHKOH_MIN		0
 #define SCTPCTL_PEER_CHKOH_MAX		0xFFFFFFFF
 #define SCTPCTL_PEER_CHKOH_DEFAULT	256
 
 /* maxburst: Default max burst for sctp endpoints */
-#define SCTPCTL_MAXBURST		10
 #define SCTPCTL_MAXBURST_DESC		"Default max burst for sctp endpoints"
 #define SCTPCTL_MAXBURST_MIN		1
 #define SCTPCTL_MAXBURST_MAX		0xFFFFFFFF
 #define SCTPCTL_MAXBURST_DEFAULT	SCTP_DEF_MAX_BURST
 
 /* maxchunks: Default max chunks on queue per asoc */
-#define SCTPCTL_MAXCHUNKS		11
 #define SCTPCTL_MAXCHUNKS_DESC		"Default max chunks on queue per asoc"
 #define SCTPCTL_MAXCHUNKS_MIN		0
 #define SCTPCTL_MAXCHUNKS_MAX		0xFFFFFFFF
 #define SCTPCTL_MAXCHUNKS_DEFAULT	SCTP_ASOC_MAX_CHUNKS_ON_QUEUE
 
 /* tcbhashsize: Tuneable for Hash table sizes */
-#define SCTPCTL_TCBHASHSIZE		12
 #define SCTPCTL_TCBHASHSIZE_DESC	"Tunable for TCB hash table sizes"
 #define SCTPCTL_TCBHASHSIZE_MIN		1
 #define SCTPCTL_TCBHASHSIZE_MAX		0xFFFFFFFF
 #define SCTPCTL_TCBHASHSIZE_DEFAULT	SCTP_TCBHASHSIZE
 
 /* pcbhashsize: Tuneable for PCB Hash table sizes */
-#define SCTPCTL_PCBHASHSIZE		13
 #define SCTPCTL_PCBHASHSIZE_DESC	"Tunable for PCB hash table sizes"
 #define SCTPCTL_PCBHASHSIZE_MIN		1
 #define SCTPCTL_PCBHASHSIZE_MAX		0xFFFFFFFF
 #define SCTPCTL_PCBHASHSIZE_DEFAULT	SCTP_PCBHASHSIZE
 
 /* min_split_point: Minimum size when splitting a chunk */
-#define SCTPCTL_MIN_SPLIT_POINT		14
 #define SCTPCTL_MIN_SPLIT_POINT_DESC	"Minimum size when splitting a chunk"
 #define SCTPCTL_MIN_SPLIT_POINT_MIN	0
 #define SCTPCTL_MIN_SPLIT_POINT_MAX	0xFFFFFFFF
 #define SCTPCTL_MIN_SPLIT_POINT_DEFAULT	SCTP_DEFAULT_SPLIT_POINT_MIN
 
 /* chunkscale: Tuneable for Scaling of number of chunks and messages */
-#define SCTPCTL_CHUNKSCALE		15
 #define SCTPCTL_CHUNKSCALE_DESC		"Tuneable for Scaling of number of chunks and messages"
 #define SCTPCTL_CHUNKSCALE_MIN		1
 #define SCTPCTL_CHUNKSCALE_MAX		0xFFFFFFFF
 #define SCTPCTL_CHUNKSCALE_DEFAULT	SCTP_CHUNKQUEUE_SCALE
 
 /* delayed_sack_time: Default delayed SACK timer in msec */
-#define SCTPCTL_DELAYED_SACK_TIME	16
 #define SCTPCTL_DELAYED_SACK_TIME_DESC	"Default delayed SACK timer in msec"
 #define SCTPCTL_DELAYED_SACK_TIME_MIN	0
 #define SCTPCTL_DELAYED_SACK_TIME_MAX	0xFFFFFFFF
 #define SCTPCTL_DELAYED_SACK_TIME_DEFAULT	SCTP_RECV_MSEC
 
 /* sack_freq: Default SACK frequency */
-#define SCTPCTL_SACK_FREQ		17
 #define SCTPCTL_SACK_FREQ_DESC		"Default SACK frequency"
 #define SCTPCTL_SACK_FREQ_MIN		0
 #define SCTPCTL_SACK_FREQ_MAX		0xFFFFFFFF
 #define SCTPCTL_SACK_FREQ_DEFAULT	SCTP_DEFAULT_SACK_FREQ
 
 /* sys_resource: Max number of cached resources in the system */
-#define SCTPCTL_SYS_RESOURCE		18
 #define SCTPCTL_SYS_RESOURCE_DESC	"Max number of cached resources in the system"
 #define SCTPCTL_SYS_RESOURCE_MIN	0
 #define SCTPCTL_SYS_RESOURCE_MAX	0xFFFFFFFF
 #define SCTPCTL_SYS_RESOURCE_DEFAULT	SCTP_DEF_SYSTEM_RESC_LIMIT
 
 /* asoc_resource: Max number of cached resources in an asoc */
-#define SCTPCTL_ASOC_RESOURCE		19
 #define SCTPCTL_ASOC_RESOURCE_DESC	"Max number of cached resources in an asoc"
 #define SCTPCTL_ASOC_RESOURCE_MIN	0
 #define SCTPCTL_ASOC_RESOURCE_MAX	0xFFFFFFFF
 #define SCTPCTL_ASOC_RESOURCE_DEFAULT	SCTP_DEF_ASOC_RESC_LIMIT
 
 /* heartbeat_interval: Default heartbeat interval in msec */
-#define SCTPCTL_HEARTBEAT_INTERVAL	20
 #define SCTPCTL_HEARTBEAT_INTERVAL_DESC	"Default heartbeat interval in msec"
 #define SCTPCTL_HEARTBEAT_INTERVAL_MIN	0
 #define SCTPCTL_HEARTBEAT_INTERVAL_MAX	0xFFFFFFFF
 #define SCTPCTL_HEARTBEAT_INTERVAL_DEFAULT	SCTP_HB_DEFAULT_MSEC
 
 /* pmtu_raise_time: Default PMTU raise timer in sec */
-#define SCTPCTL_PMTU_RAISE_TIME		21
 #define SCTPCTL_PMTU_RAISE_TIME_DESC	"Default PMTU raise timer in sec"
 #define SCTPCTL_PMTU_RAISE_TIME_MIN	0
 #define SCTPCTL_PMTU_RAISE_TIME_MAX	0xFFFFFFFF
 #define SCTPCTL_PMTU_RAISE_TIME_DEFAULT	SCTP_DEF_PMTU_RAISE_SEC
 
 /* shutdown_guard_time: Default shutdown guard timer in sec */
-#define SCTPCTL_SHUTDOWN_GUARD_TIME		22
 #define SCTPCTL_SHUTDOWN_GUARD_TIME_DESC	"Default shutdown guard timer in sec"
 #define SCTPCTL_SHUTDOWN_GUARD_TIME_MIN		0
 #define SCTPCTL_SHUTDOWN_GUARD_TIME_MAX		0xFFFFFFFF
 #define SCTPCTL_SHUTDOWN_GUARD_TIME_DEFAULT	SCTP_DEF_MAX_SHUTDOWN_SEC
 
 /* secret_lifetime: Default secret lifetime in sec */
-#define SCTPCTL_SECRET_LIFETIME		23
 #define SCTPCTL_SECRET_LIFETIME_DESC	"Default secret lifetime in sec"
 #define SCTPCTL_SECRET_LIFETIME_MIN	0
 #define SCTPCTL_SECRET_LIFETIME_MAX	0xFFFFFFFF
 #define SCTPCTL_SECRET_LIFETIME_DEFAULT	SCTP_DEFAULT_SECRET_LIFE_SEC
 
 /* rto_max: Default maximum retransmission timeout in msec */
-#define SCTPCTL_RTO_MAX			24
 #define SCTPCTL_RTO_MAX_DESC		"Default maximum retransmission timeout in msec"
 #define SCTPCTL_RTO_MAX_MIN		0
 #define SCTPCTL_RTO_MAX_MAX		0xFFFFFFFF
 #define SCTPCTL_RTO_MAX_DEFAULT		SCTP_RTO_UPPER_BOUND
 
 /* rto_min: Default minimum retransmission timeout in msec */
-#define SCTPCTL_RTO_MIN			25
 #define SCTPCTL_RTO_MIN_DESC		"Default minimum retransmission timeout in msec"
 #define SCTPCTL_RTO_MIN_MIN		0
 #define SCTPCTL_RTO_MIN_MAX		0xFFFFFFFF
 #define SCTPCTL_RTO_MIN_DEFAULT		SCTP_RTO_LOWER_BOUND
 
 /* rto_initial: Default initial retransmission timeout in msec */
-#define SCTPCTL_RTO_INITIAL		26
 #define SCTPCTL_RTO_INITIAL_DESC	"Default initial retransmission timeout in msec"
 #define SCTPCTL_RTO_INITIAL_MIN		0
 #define SCTPCTL_RTO_INITIAL_MAX		0xFFFFFFFF
 #define SCTPCTL_RTO_INITIAL_DEFAULT	SCTP_RTO_INITIAL
 
 /* init_rto_max: Default maximum retransmission timeout during association setup in msec */
-#define SCTPCTL_INIT_RTO_MAX		27
 #define SCTPCTL_INIT_RTO_MAX_DESC	"Default maximum retransmission timeout during association setup in msec"
 #define SCTPCTL_INIT_RTO_MAX_MIN	0
 #define SCTPCTL_INIT_RTO_MAX_MAX	0xFFFFFFFF
 #define SCTPCTL_INIT_RTO_MAX_DEFAULT	SCTP_RTO_UPPER_BOUND
 
 /* valid_cookie_life: Default cookie lifetime in sec */
-#define SCTPCTL_VALID_COOKIE_LIFE	28
 #define SCTPCTL_VALID_COOKIE_LIFE_DESC	"Default cookie lifetime in sec"
 #define SCTPCTL_VALID_COOKIE_LIFE_MIN	0
 #define SCTPCTL_VALID_COOKIE_LIFE_MAX	0xFFFFFFFF
 #define SCTPCTL_VALID_COOKIE_LIFE_DEFAULT	SCTP_DEFAULT_COOKIE_LIFE
 
 /* init_rtx_max: Default maximum number of retransmission for INIT chunks */
-#define SCTPCTL_INIT_RTX_MAX		29
 #define SCTPCTL_INIT_RTX_MAX_DESC	"Default maximum number of retransmission for INIT chunks"
 #define SCTPCTL_INIT_RTX_MAX_MIN	0
 #define SCTPCTL_INIT_RTX_MAX_MAX	0xFFFFFFFF
 #define SCTPCTL_INIT_RTX_MAX_DEFAULT	SCTP_DEF_MAX_INIT
 
 /* assoc_rtx_max: Default maximum number of retransmissions per association */
-#define SCTPCTL_ASSOC_RTX_MAX		30
 #define SCTPCTL_ASSOC_RTX_MAX_DESC	"Default maximum number of retransmissions per association"
 #define SCTPCTL_ASSOC_RTX_MAX_MIN	0
 #define SCTPCTL_ASSOC_RTX_MAX_MAX	0xFFFFFFFF
 #define SCTPCTL_ASSOC_RTX_MAX_DEFAULT	SCTP_DEF_MAX_SEND
 
 /* path_rtx_max: Default maximum of retransmissions per path */
-#define SCTPCTL_PATH_RTX_MAX		31
 #define SCTPCTL_PATH_RTX_MAX_DESC	"Default maximum of retransmissions per path"
 #define SCTPCTL_PATH_RTX_MAX_MIN	0
 #define SCTPCTL_PATH_RTX_MAX_MAX	0xFFFFFFFF
 #define SCTPCTL_PATH_RTX_MAX_DEFAULT	SCTP_DEF_MAX_PATH_RTX
 
 /* add_more_on_output: When space wise is it worthwhile to try to add more to a socket send buffer */
-#define SCTPCTL_ADD_MORE_ON_OUTPUT	32
 #define SCTPCTL_ADD_MORE_ON_OUTPUT_DESC	"When space wise is it worthwhile to try to add more to a socket send buffer"
 #define SCTPCTL_ADD_MORE_ON_OUTPUT_MIN	0
 #define SCTPCTL_ADD_MORE_ON_OUTPUT_MAX	0xFFFFFFFF
 #define SCTPCTL_ADD_MORE_ON_OUTPUT_DEFAULT SCTP_DEFAULT_ADD_MORE
 
 /* outgoing_streams: Default number of outgoing streams */
-#define SCTPCTL_OUTGOING_STREAMS	33
 #define SCTPCTL_OUTGOING_STREAMS_DESC	"Default number of outgoing streams"
 #define SCTPCTL_OUTGOING_STREAMS_MIN	1
 #define SCTPCTL_OUTGOING_STREAMS_MAX	65535
 #define SCTPCTL_OUTGOING_STREAMS_DEFAULT SCTP_OSTREAM_INITIAL
 
 /* cmt_on_off: CMT on/off flag */
-#define SCTPCTL_CMT_ON_OFF		34
 #define SCTPCTL_CMT_ON_OFF_DESC		"CMT on/off flag"
 #define SCTPCTL_CMT_ON_OFF_MIN		0
 #define SCTPCTL_CMT_ON_OFF_MAX		1
 #define SCTPCTL_CMT_ON_OFF_DEFAULT	0
 
 /* cmt_use_dac: CMT DAC on/off flag */
-#define SCTPCTL_CMT_USE_DAC		35
 #define SCTPCTL_CMT_USE_DAC_DESC	"CMT DAC on/off flag"
 #define SCTPCTL_CMT_USE_DAC_MIN		0
 #define SCTPCTL_CMT_USE_DAC_MAX		1
 #define SCTPCTL_CMT_USE_DAC_DEFAULT    	0
 
 /* JRS 5/2107 - CMT PF type flag */
-#define SCTPCTL_CMT_PF			36
 #define SCTPCTL_CMT_PF_DESC		"CMT PF type flag"
 #define SCTPCTL_CMT_PF_MIN		0
 #define SCTPCTL_CMT_PF_MAX		2
 #define SCTPCTL_CMT_PF_DEFAULT		0
 
 /* cwnd_maxburst: Use a CWND adjusting maxburst */
-#define SCTPCTL_CWND_MAXBURST		37
 #define SCTPCTL_CWND_MAXBURST_DESC	"Use a CWND adjusting maxburst"
 #define SCTPCTL_CWND_MAXBURST_MIN	0
 #define SCTPCTL_CWND_MAXBURST_MAX	1
 #define SCTPCTL_CWND_MAXBURST_DEFAULT	1
 
 /* early_fast_retran: Early Fast Retransmit with timer */
-#define SCTPCTL_EARLY_FAST_RETRAN	38
 #define SCTPCTL_EARLY_FAST_RETRAN_DESC	"Early Fast Retransmit with timer"
 #define SCTPCTL_EARLY_FAST_RETRAN_MIN	0
 #define SCTPCTL_EARLY_FAST_RETRAN_MAX	0xFFFFFFFF
 #define SCTPCTL_EARLY_FAST_RETRAN_DEFAULT	0
 
 /* early_fast_retran_msec: Early Fast Retransmit minimum timer value */
-#define SCTPCTL_EARLY_FAST_RETRAN_MSEC		39
 #define SCTPCTL_EARLY_FAST_RETRAN_MSEC_DESC	"Early Fast Retransmit minimum timer value"
 #define SCTPCTL_EARLY_FAST_RETRAN_MSEC_MIN	0
 #define SCTPCTL_EARLY_FAST_RETRAN_MSEC_MAX	0xFFFFFFFF
 #define SCTPCTL_EARLY_FAST_RETRAN_MSEC_DEFAULT	SCTP_MINFR_MSEC_TIMER
 
 /* asconf_auth_nochk: Disable SCTP ASCONF AUTH requirement */
-#define SCTPCTL_ASCONF_AUTH_NOCHK	40
 #define SCTPCTL_ASCONF_AUTH_NOCHK_DESC	"Disable SCTP ASCONF AUTH requirement"
 #define SCTPCTL_ASCONF_AUTH_NOCHK_MIN	0
 #define SCTPCTL_ASCONF_AUTH_NOCHK_MAX	1
 #define SCTPCTL_ASCONF_AUTH_NOCHK_DEFAULT	0
 
 /* auth_disable: Disable SCTP AUTH function */
-#define SCTPCTL_AUTH_DISABLE		41
 #define SCTPCTL_AUTH_DISABLE_DESC	"Disable SCTP AUTH function"
 #define SCTPCTL_AUTH_DISABLE_MIN	0
 #define SCTPCTL_AUTH_DISABLE_MAX	1
 #define SCTPCTL_AUTH_DISABLE_DEFAULT	0
 
 /* nat_friendly: SCTP NAT friendly operation */
-#define SCTPCTL_NAT_FRIENDLY		42
 #define SCTPCTL_NAT_FRIENDLY_DESC	"SCTP NAT friendly operation"
 #define SCTPCTL_NAT_FRIENDLY_MIN	0
 #define SCTPCTL_NAT_FRIENDLY_MAX	1
 #define SCTPCTL_NAT_FRIENDLY_DEFAULT	1
 
 /* abc_l_var: SCTP ABC max increase per SACK (L) */
-#define SCTPCTL_ABC_L_VAR		43
 #define SCTPCTL_ABC_L_VAR_DESC		"SCTP ABC max increase per SACK (L)"
 #define SCTPCTL_ABC_L_VAR_MIN		0
 #define SCTPCTL_ABC_L_VAR_MAX		0xFFFFFFFF
 #define SCTPCTL_ABC_L_VAR_DEFAULT	1
 
 /* max_chained_mbufs: Default max number of small mbufs on a chain */
-#define SCTPCTL_MAX_CHAINED_MBUFS	44
 #define SCTPCTL_MAX_CHAINED_MBUFS_DESC	"Default max number of small mbufs on a chain"
 #define SCTPCTL_MAX_CHAINED_MBUFS_MIN	0
 #define SCTPCTL_MAX_CHAINED_MBUFS_MAX	0xFFFFFFFF
 #define SCTPCTL_MAX_CHAINED_MBUFS_DEFAULT	SCTP_DEFAULT_MBUFS_IN_CHAIN
 
 /* do_sctp_drain: Should SCTP respond to the drain calls */
-#define SCTPCTL_DO_SCTP_DRAIN		45
 #define SCTPCTL_DO_SCTP_DRAIN_DESC	"Should SCTP respond to the drain calls"
 #define SCTPCTL_DO_SCTP_DRAIN_MIN	0
 #define SCTPCTL_DO_SCTP_DRAIN_MAX	1
 #define SCTPCTL_DO_SCTP_DRAIN_DEFAULT	1
 
 /* hb_max_burst: Confirmation Heartbeat max burst? */
-#define SCTPCTL_HB_MAX_BURST		46
 #define SCTPCTL_HB_MAX_BURST_DESC	"Confirmation Heartbeat max burst"
 #define SCTPCTL_HB_MAX_BURST_MIN	1
 #define SCTPCTL_HB_MAX_BURST_MAX	0xFFFFFFFF
 #define SCTPCTL_HB_MAX_BURST_DEFAULT	SCTP_DEF_MAX_BURST
 
 /* abort_at_limit: When one-2-one hits qlimit abort */
-#define SCTPCTL_ABORT_AT_LIMIT		47
 #define SCTPCTL_ABORT_AT_LIMIT_DESC	"When one-2-one hits qlimit abort"
 #define SCTPCTL_ABORT_AT_LIMIT_MIN	0
 #define SCTPCTL_ABORT_AT_LIMIT_MAX	1
 #define SCTPCTL_ABORT_AT_LIMIT_DEFAULT	0
 
 /* strict_data_order: Enforce strict data ordering, abort if control inside data */
-#define SCTPCTL_STRICT_DATA_ORDER	48
 #define SCTPCTL_STRICT_DATA_ORDER_DESC	"Enforce strict data ordering, abort if control inside data"
 #define SCTPCTL_STRICT_DATA_ORDER_MIN	0
 #define SCTPCTL_STRICT_DATA_ORDER_MAX	1
 #define SCTPCTL_STRICT_DATA_ORDER_DEFAULT	0
 
 /* min_residual: min residual in a data fragment leftover */
-#define SCTPCTL_MIN_REDIDUAL		49
 #define SCTPCTL_MIN_RESIDUAL_DESC	"Minimum residual data chunk in second part of split"
 #define SCTPCTL_MIN_RESIDUAL_MIN	20
 #define SCTPCTL_MIN_RESIDUAL_MAX	65535
 #define SCTPCTL_MIN_RESIDUAL_DEFAULT	1452
 
 /* max_retran_chunk: max chunk retransmissions */
-#define SCTPCTL_MAX_RETRAN_CHUNK	50
 #define SCTPCTL_MAX_RETRAN_CHUNK_DESC	"Maximum times an unlucky chunk can be retran'd before assoc abort"
 #define SCTPCTL_MAX_RETRAN_CHUNK_MIN	0
 #define SCTPCTL_MAX_RETRAN_CHUNK_MAX	65535
 #define SCTPCTL_MAX_RETRAN_CHUNK_DEFAULT	30
 
 /* sctp_logging: This gives us logging when the options are enabled */
-#define SCTPCTL_LOGGING_LEVEL		51
 #define SCTPCTL_LOGGING_LEVEL_DESC	"Ltrace/KTR trace logging level"
 #define SCTPCTL_LOGGING_LEVEL_MIN	0
 #define SCTPCTL_LOGGING_LEVEL_MAX	0xffffffff
 #define SCTPCTL_LOGGING_LEVEL_DEFAULT	0
 
 /* JRS - default congestion control module sysctl */
-#define SCTPCTL_DEFAULT_CC_MODULE		52
 #define SCTPCTL_DEFAULT_CC_MODULE_DESC		"Default congestion control module"
 #define SCTPCTL_DEFAULT_CC_MODULE_MIN		0
 #define SCTPCTL_DEFAULT_CC_MODULE_MAX		2
 #define SCTPCTL_DEFAULT_CC_MODULE_DEFAULT	0
 
 /* RRS - default fragment interleave */
-#define SCTPCTL_DEFAULT_FRAG_INTERLEAVE		53
 #define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_DESC	"Default fragment interleave level"
 #define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_MIN	0
 #define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_MAX	2
 #define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_DEFAULT	1
 
 /* mobility_base: Enable SCTP mobility support */
-#define SCTPCTL_MOBILITY_BASE		54
 #define SCTPCTL_MOBILITY_BASE_DESC	"Enable SCTP base mobility"
 #define SCTPCTL_MOBILITY_BASE_MIN	0
 #define SCTPCTL_MOBILITY_BASE_MAX	1
 #define SCTPCTL_MOBILITY_BASE_DEFAULT	SCTP_DEFAULT_MOBILITY_BASE
 
 /* mobility_fasthandoff: Enable SCTP fast handoff support */
-#define SCTPCTL_MOBILITY_FASTHANDOFF		55
 #define SCTPCTL_MOBILITY_FASTHANDOFF_DESC	"Enable SCTP fast handoff"
 #define SCTPCTL_MOBILITY_FASTHANDOFF_MIN	0
 #define SCTPCTL_MOBILITY_FASTHANDOFF_MAX	1
@@ -427,7 +372,6 @@ __FBSDID("$FreeBSD$");
 
 #if defined(SCTP_DEBUG)
 /* debug: Configure debug output */
-#define SCTPCTL_DEBUG		56
 #define SCTPCTL_DEBUG_DESC	"Configure debug output"
 #define SCTPCTL_DEBUG_MIN	0
 #define SCTPCTL_DEBUG_MAX	0xFFFFFFFF