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

[Sergey Kandaurov]

1 сент. 2017 г. 18:55 пользователь "Josh Paetzel" <jpaetzel at freebsd.org>
написал:

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


Looks like the wrong line is removed.