From 3839369c03347286829c71525e5ccdcee1a8c50a Mon Sep 17 00:00:00 2001 From: "George V. Neville-Neil" Date: Sat, 4 Jul 2015 17:37:00 +0000 Subject: [PATCH] Enable IPSEC in all GENERIC kernels. Universe and kernel build tests passed 4 July 2015 PR: 128030 Sponsored by: Rubicon Communications (Netgate) --- sys/amd64/conf/GENERIC | 3 +++ sys/arm64/conf/GENERIC | 4 ++++ sys/i386/conf/GENERIC | 4 ++++ sys/pc98/conf/GENERIC | 4 ++++ sys/powerpc/conf/GENERIC | 3 +++ sys/sparc64/conf/GENERIC | 4 ++++ 6 files changed, 22 insertions(+) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 3d2cc39c635..dd1aa8bed3e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -28,6 +28,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options IPSEC # IP (v4/v6) security options TCP_OFFLOAD # TCP offload options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem @@ -363,3 +364,5 @@ device vmx # VMware VMXNET3 Ethernet # Netmap provides direct access to TX/RX rings on supported NICs device netmap # netmap(4) support +# The cypto framework is required by IPSEC +device crypto # Required by IPSEC diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 134354b5d5a..55826a42df2 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -28,6 +28,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options IPSEC # IP (v4/v6) security options TCP_OFFLOAD # TCP offload options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem @@ -109,3 +110,6 @@ device bpf # Berkeley packet filter options FDT device acpi + +# The cypto framework is required by IPSEC +device crypto # Required by IPSEC diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index d1d2a2f457b..6a17ff7b530 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -30,6 +30,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options IPSEC # IP (v4/v6) security options TCP_OFFLOAD # TCP offload options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem @@ -377,3 +378,6 @@ device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet + +# The cypto framework is required by IPSEC +device crypto # Required by IPSEC diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index b826adb1493..3e970db32aa 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -29,6 +29,7 @@ options SCHED_4BSD # 4BSD scheduler #options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options IPSEC # IP (v4/v6) security options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support @@ -255,3 +256,6 @@ device bpf # Berkeley packet filter #device snd_mss # Microsoft Sound System #device "snd_sb16" # Sound Blaster 16 #device snd_sbc # Sound Blaster + +# The cypto framework is required by IPSEC +device crypto # Required by IPSEC diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 4172d532dc9..8afbda311ee 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -37,6 +37,7 @@ options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption options INET #InterNETworking options INET6 #IPv6 communications protocols +options IPSEC # IP (v4/v6) security options SCTP #Stream Control Transmission Protocol options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -216,3 +217,5 @@ device snd_ai2s # Apple I2S audio device snd_davbus # Apple DAVBUS audio device snd_uaudio # USB Audio +# The cypto framework is required by IPSEC +device crypto # Required by IPSEC diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index f602eeb712d..691153ab5f0 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -30,6 +30,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options IPSEC # IP (v4/v6) security options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support @@ -249,3 +250,6 @@ 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 cypto framework is required by IPSEC +device crypto # Required by IPSEC