Author: jhb
Date: Sat Aug 18 20:32:08 2018
New Revision: 338023
URL: https://svnweb.freebsd.org/changeset/base/338023
Log:
Make 'device crypto' lines more consistent.
- In configurations with a pseudo devices section, move 'device crypto'
into that section.
- Use a consistent comment. Note that other things common in kernel
configs such as GELI also require 'device crypto', not just IPSEC.
Reviewed by: rgrimes, cem, imp
Differential Revision: https://reviews.freebsd.org/D16775
Modified:
head/sys/amd64/conf/GENERIC
head/sys/arm/conf/std.armv6
head/sys/arm/conf/std.armv7
head/sys/arm64/conf/GENERIC
head/sys/i386/conf/GENERIC
head/sys/powerpc/conf/GENERIC
head/sys/riscv/conf/GENERIC
head/sys/sparc64/conf/GENERIC
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Sat Aug 18 20:28:25 2018 (r338022)
+++ head/sys/amd64/conf/GENERIC Sat Aug 18 20:32:08 2018 (r338023)
@@ -314,6 +314,7 @@ device wi #
WaveLAN/Intersil/Symbol 802.11 wireless
device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
@@ -376,6 +377,3 @@ device vmx # VMware
VMXNET3 Ethernet
# Netmap provides direct access to TX/RX rings on supported NICs
device netmap # netmap(4) support
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Modified: head/sys/arm/conf/std.armv6
==============================================================================
--- head/sys/arm/conf/std.armv6 Sat Aug 18 20:28:25 2018 (r338022)
+++ head/sys/arm/conf/std.armv6 Sat Aug 18 20:32:08 2018 (r338023)
@@ -9,7 +9,7 @@ options VIMAGE # Subsystem
virtualization, e.g. VNE
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options TCP_HHOOK # hhook(9) framework for TCP
-device crypto # IPSec && !crypto is nonsensical
+device crypto # core crypto support
options IPSEC # IP (v4/v6) security
options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
Modified: head/sys/arm/conf/std.armv7
==============================================================================
--- head/sys/arm/conf/std.armv7 Sat Aug 18 20:28:25 2018 (r338022)
+++ head/sys/arm/conf/std.armv7 Sat Aug 18 20:32:08 2018 (r338023)
@@ -9,7 +9,7 @@ options VIMAGE # Subsystem
virtualization, e.g. VNE
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options TCP_HHOOK # hhook(9) framework for TCP
-device crypto # IPSec && !crypto is nonsensical
+device crypto # core crypto support
options IPSEC # IP (v4/v6) security
options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC Sat Aug 18 20:28:25 2018 (r338022)
+++ head/sys/arm64/conf/GENERIC Sat Aug 18 20:32:08 2018 (r338023)
@@ -237,6 +237,7 @@ device kbdmux
device vt_efifb
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -266,6 +267,3 @@ options THUNDERX_PASS_1_1_ERRATA
options FDT
device acpi
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Sat Aug 18 20:28:25 2018 (r338022)
+++ head/sys/i386/conf/GENERIC Sat Aug 18 20:32:08 2018 (r338023)
@@ -318,6 +318,7 @@ device wi #
WaveLAN/Intersil/Symbol 802.11 wireless
device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device padlock_rng # VIA Padlock RNG
@@ -377,6 +378,3 @@ device xenpci # Xen HVM
Hypervisor services driver
# VMware support
device vmx # VMware VMXNET3 Ethernet
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Sat Aug 18 20:28:25 2018
(r338022)
+++ head/sys/powerpc/conf/GENERIC Sat Aug 18 20:32:08 2018
(r338023)
@@ -160,6 +160,7 @@ device dc # DEC/Intel 21143 and
various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -225,6 +226,3 @@ device sound # Generic sound driver
(required)
device snd_ai2s # Apple I2S audio
device snd_davbus # Apple DAVBUS audio
device snd_uaudio # USB Audio
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
Modified: head/sys/riscv/conf/GENERIC
==============================================================================
--- head/sys/riscv/conf/GENERIC Sat Aug 18 20:28:25 2018 (r338022)
+++ head/sys/riscv/conf/GENERIC Sat Aug 18 20:32:08 2018 (r338023)
@@ -36,7 +36,6 @@ options INET6 # IPv6 communications
protocols
options TCP_HHOOK # hhook(9) framework for TCP
options IPSEC # IP (v4/v6) security
options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5
-device crypto # core crypto support (required for
IPSEC)
options TCP_OFFLOAD # TCP offload
options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
@@ -121,6 +120,7 @@ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9)
options ZSTDIO # zstd-compressed kernel and
user dumps
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Sat Aug 18 20:28:25 2018
(r338022)
+++ head/sys/sparc64/conf/GENERIC Sat Aug 18 20:32:08 2018
(r338023)
@@ -229,6 +229,7 @@ options AH_SUPPORT_AR5416 # enable AR5416 tx/rx
descr
device ath_rate_sample # SampleRate tx rate control for ath
# Pseudo devices.
+device crypto # core crypto support
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -257,6 +258,3 @@ device sound # Generic sound driver
(required)
device snd_audiocs # Crystal Semiconductor CS4231
device snd_es137x # Ensoniq AudioPCI ES137x
device snd_t4dwave # Acer Labs M5451
-
-# The crypto framework is required by IPSEC
-device crypto # Required by IPSEC
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
