From e64080e79c53f2952c5a77c6402cd2473cd45d8c Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 16 Jul 2020 15:09:04 +0000 Subject: [PATCH] Switch from SCTP to SCTP_SUPPORT in GENERIC configs. This removes SCTP from in-tree kernel configuration files. Now, SCTP can be enabled by simply loading the module, as discussed on freebsd-net@. Reviewed by: tuexen Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25611 --- sys/amd64/conf/GENERIC | 2 +- sys/amd64/conf/MINIMAL | 2 +- sys/arm/conf/std.armv6 | 2 +- sys/arm/conf/std.armv7 | 2 +- sys/arm64/conf/GENERIC | 2 +- sys/i386/conf/GENERIC | 2 +- sys/i386/conf/MINIMAL | 2 +- sys/mips/conf/ERL | 2 +- sys/mips/conf/OCTEON1 | 2 +- sys/powerpc/conf/GENERIC | 2 +- sys/powerpc/conf/GENERIC64 | 2 +- sys/riscv/conf/GENERIC | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 57fcadc3283..482507b6eb3 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -35,7 +35,7 @@ options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 211e00e7de4..0c5f43b20d5 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -44,7 +44,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_OFFLOAD # TCP offload -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 0b5a10a9602..c6672063f72 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -12,7 +12,7 @@ options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP device crypto # core crypto support options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 8b50c7d3261..2f0d8e590d0 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -12,7 +12,7 @@ options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP device crypto # core crypto support options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 30d1a8a0d9a..e8fd9fab196 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -34,7 +34,7 @@ options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 options TCP_HHOOK # hhook(9) framework for TCP options TCP_OFFLOAD # TCP offload options TCP_RFC7413 # TCP Fast Open -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index f93f2b1b342..9adf42a139f 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -34,7 +34,7 @@ options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 options TCP_HHOOK # hhook(9) framework for TCP options TCP_OFFLOAD # TCP offload -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index 0f1d268d013..1c5a2187868 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -45,7 +45,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_OFFLOAD # TCP offload -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/mips/conf/ERL b/sys/mips/conf/ERL index 6273fa1a1c2..c5688729c34 100644 --- a/sys/mips/conf/ERL +++ b/sys/mips/conf/ERL @@ -55,7 +55,7 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC # IP (v4/v6) security options TCP_HHOOK # hhook(9) framework for TCP -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1 index 16137c1bfe4..ce188b660bf 100644 --- a/sys/mips/conf/OCTEON1 +++ b/sys/mips/conf/OCTEON1 @@ -55,7 +55,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 114a194a4e0..f141a113f26 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -41,7 +41,7 @@ options INET6 #IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open -options SCTP #Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index f0e81929d0f..77fc641dbb4 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -45,7 +45,7 @@ options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open -options SCTP #Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 0e2502569f4..4cde17013fa 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -32,7 +32,7 @@ options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 options TCP_OFFLOAD # TCP offload -options SCTP # Stream Control Transmission Protocol +options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists