[src/trunk]: src/sys/arch enable IPSEC

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0b8701f1877
branches:  trunk
changeset: 329573:d0b8701f1877
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 29 14:48:40 2014 +0000

description:
enable IPSEC

diffstat:

 sys/arch/amd64/conf/GENERIC |  6 +++---
 sys/arch/i386/conf/GENERIC  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r df8689e0252b -r d0b8701f1877 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Thu May 29 14:41:26 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Thu May 29 14:48:40 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.386 2014/04/21 16:35:38 chs Exp $
+# $NetBSD: GENERIC,v 1.387 2014/05/29 14:49:35 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.386 $"
+#ident                 "GENERIC-$Revision: 1.387 $"
 
 maxusers       64              # estimated number of users
 
@@ -176,7 +176,7 @@
 #options       GATEWAY         # packet forwarding
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPV6
-#options       IPSEC           # IP security
+options        IPSEC           # IP security
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MPLS            # MultiProtocol Label Switching (needs ifmpls)
 #options       MROUTING        # IP multicast routing
diff -r df8689e0252b -r d0b8701f1877 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Thu May 29 14:41:26 2014 +0000
+++ b/sys/arch/i386/conf/GENERIC        Thu May 29 14:48:40 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1103 2014/04/21 16:35:38 chs Exp $
+# $NetBSD: GENERIC,v 1.1104 2014/05/29 14:48:40 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1103 $"
+#ident                 "GENERIC-$Revision: 1.1104 $"
 
 maxusers       64              # estimated number of users
 
@@ -199,7 +199,7 @@
 #options       GATEWAY         # packet forwarding
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPv6
-#options       IPSEC           # IP security
+options        IPSEC           # IP security
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MPLS            # MultiProtocol Label Switching (needs ifmpls)
 #options       MROUTING        # IP multicast routing