aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2020-07-16 15:09:04 +0000
committerMark Johnston <markj@FreeBSD.org>2020-07-16 15:09:04 +0000
commite64080e79c53f2952c5a77c6402cd2473cd45d8c (patch)
tree5c61c441a2a707a3cfb32c8112736c9fbaab90ad
parentcef5fc74c255369d55850b961163b01e77785a78 (diff)
downloadsrc-e64080e79c53.tar.gz
src-e64080e79c53.zip
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
Notes
Notes: svn path=/head/; revision=363253
Diffstat
-rw-r--r--sys/amd64/conf/GENERIC2
-rw-r--r--sys/amd64/conf/MINIMAL2
-rw-r--r--sys/arm/conf/std.armv62
-rw-r--r--sys/arm/conf/std.armv72
-rw-r--r--sys/arm64/conf/GENERIC2
-rw-r--r--sys/i386/conf/GENERIC2
-rw-r--r--sys/i386/conf/MINIMAL2
-rw-r--r--sys/mips/conf/ERL2
-rw-r--r--sys/mips/conf/OCTEON12
-rw-r--r--sys/powerpc/conf/GENERIC2
-rw-r--r--sys/powerpc/conf/GENERIC642
-rw-r--r--sys/riscv/conf/GENERIC2
12 files changed, 12 insertions, 12 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 57fcadc3283c..482507b6eb3c 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 211e00e7de46..0c5f43b20d54 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 0b5a10a9602b..c6672063f724 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 8b50c7d32615..2f0d8e590d0e 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 30d1a8a0d9ad..e8fd9fab1961 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 f93f2b1b3424..9adf42a139fa 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 0f1d268d013e..1c5a21878684 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 6273fa1a1c23..c5688729c344 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 16137c1bfe4e..ce188b660bf2 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 114a194a4e0d..f141a113f269 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 f0e81929d0fa..77fc641dbb4b 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 0e2502569f4f..4cde17013fa3 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 00:18:18 +0000