[src/netbsd-3]: src/sys/arch Pull up revision 1.26 (requested by tron in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/7e70e7e418cc
branches:  netbsd-3
changeset: 576693:7e70e7e418cc
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:39 2005 +0000

description:
Pull up revision 1.26 (requested by tron in ticket #566):
Add (commented out) IPSEC_NAT_T option.

diffstat:

 sys/arch/hpcmips/conf/VR41XX |  5 +++--
 sys/arch/next68k/conf/SLAB   |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r b46bb814afb5 -r 7e70e7e418cc sys/arch/hpcmips/conf/VR41XX
--- a/sys/arch/hpcmips/conf/VR41XX      Mon Jul 18 21:14:37 2005 +0000
+++ b/sys/arch/hpcmips/conf/VR41XX      Mon Jul 18 21:14:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.24.4.1 2005/04/17 11:44:02 tron Exp $
+# $NetBSD: VR41XX,v 1.24.4.2 2005/07/18 21:14:39 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include                "arch/hpcmips/conf/std.hpcmips"
 include                "arch/hpcmips/conf/std.hpcmips.vr41"
-#ident                 "GENERIC-$Revision: 1.24.4.1 $"
+#ident                 "GENERIC-$Revision: 1.24.4.2 $"
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
@@ -96,6 +96,7 @@
 options        INET6           # IPV6
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/ IPSEC)
+#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MROUTING        # Multicast routing support
 #options       PIM             # Protocol Independent Multicast
diff -r b46bb814afb5 -r 7e70e7e418cc sys/arch/next68k/conf/SLAB
--- a/sys/arch/next68k/conf/SLAB        Mon Jul 18 21:14:37 2005 +0000
+++ b/sys/arch/next68k/conf/SLAB        Mon Jul 18 21:14:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SLAB,v 1.25 2005/02/25 13:46:50 simonb Exp $
+# $NetBSD: SLAB,v 1.25.2.1 2005/07/18 21:14:39 riz Exp $
 #
 # deberg's development machine
 #
@@ -97,6 +97,7 @@
 options        INET6           # IPV6
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 #options       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast