svn commit: r323087 - in head/sys: amd64/conf arm64/conf i386/conf powerpc/conf riscv/conf sparc64/conf

Rodney W. Grimes freebsd at pdx.rh.CN85.dnsmgr.net
Fri Sep 1 17:06:19 UTC 2017


[ Charset UTF-8 unsupported, converting... ]
> Author: jpaetzel
> Date: Fri Sep  1 15:54:53 2017
> New Revision: 323087
> URL: https://svnweb.freebsd.org/changeset/base/323087
> 
> Log:
>   Take options IPSEC out of GENERIC
>   
>   PR:	220170
>   Submitted by:	delphij
>   Reviewed by:	ae, glebius
>   MFC after:	2 weeks
>   Differential Revision:	D11806
> 
> Modified:
>   head/sys/amd64/conf/GENERIC
>   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	Fri Sep  1 11:51:07 2017	(r323086)
> +++ head/sys/amd64/conf/GENERIC	Fri Sep  1 15:54:53 2017	(r323087)
> @@ -28,7 +28,6 @@ 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 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
>  options 	TCP_OFFLOAD		# TCP offload
>  options 	TCP_HHOOK		# hhook(9) framework for TCP
> 
> Modified: head/sys/arm64/conf/GENERIC
> ==============================================================================
> --- head/sys/arm64/conf/GENERIC	Fri Sep  1 11:51:07 2017	(r323086)
> +++ head/sys/arm64/conf/GENERIC	Fri Sep  1 15:54:53 2017	(r323087)
> @@ -29,7 +29,6 @@ options 	PREEMPTION		# Enable kernel thread preemption
>  options 	INET			# InterNETworking
>  options 	INET6			# IPv6 communications protocols
>  options 	IPSEC			# IP (v4/v6) security
> -options		IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5

Was this a miss fire???

>  options 	TCP_HHOOK		# hhook(9) framework for TCP
>  options 	TCP_OFFLOAD		# TCP offload
>  options 	SCTP			# Stream Control Transmission Protocol
> 
> Modified: head/sys/i386/conf/GENERIC
> ==============================================================================
> --- head/sys/i386/conf/GENERIC	Fri Sep  1 11:51:07 2017	(r323086)
> +++ head/sys/i386/conf/GENERIC	Fri Sep  1 15:54:53 2017	(r323087)
> @@ -30,7 +30,6 @@ 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		IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
>  options 	TCP_HHOOK		# hhook(9) framework for TCP
>  options 	TCP_OFFLOAD		# TCP offload
> 
> Modified: head/sys/powerpc/conf/GENERIC
> ==============================================================================
> --- head/sys/powerpc/conf/GENERIC	Fri Sep  1 11:51:07 2017	(r323086)
> +++ head/sys/powerpc/conf/GENERIC	Fri Sep  1 15:54:53 2017	(r323087)
> @@ -37,7 +37,6 @@ 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		IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
>  options 	TCP_HHOOK		# hhook(9) framework for TCP
>  options 	SCTP			#Stream Control Transmission Protocol
> 
> Modified: head/sys/riscv/conf/GENERIC
> ==============================================================================
> --- head/sys/riscv/conf/GENERIC	Fri Sep  1 11:51:07 2017	(r323086)
> +++ head/sys/riscv/conf/GENERIC	Fri Sep  1 15:54:53 2017	(r323087)
> @@ -33,7 +33,6 @@ options 	PREEMPTION		# Enable kernel thread preemption
>  options 	INET			# InterNETworking
>  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
>  options 	TCP_OFFLOAD		# TCP offload
>  options 	SCTP			# Stream Control Transmission Protocol
> 
> Modified: head/sys/sparc64/conf/GENERIC
> ==============================================================================
> --- head/sys/sparc64/conf/GENERIC	Fri Sep  1 11:51:07 2017	(r323086)
> +++ head/sys/sparc64/conf/GENERIC	Fri Sep  1 15:54:53 2017	(r323087)
> @@ -30,7 +30,6 @@ 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		IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
>  options 	TCP_HHOOK		# hhook(9) framework for TCP
>  options 	SCTP			# Stream Control Transmission Protocol
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org


More information about the svn-src-head mailing list