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

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

details:   https://anonhg.NetBSD.org/src/rev/286fb9f3a5ad
branches:  netbsd-3
changeset: 576685:286fb9f3a5ad
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:23 2005 +0000

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

diffstat:

 sys/arch/evbppc/conf/WALNUT |  3 ++-
 sys/arch/sun2/conf/DISKLESS |  5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 340ab125b646 -r 286fb9f3a5ad sys/arch/evbppc/conf/WALNUT
--- a/sys/arch/evbppc/conf/WALNUT       Mon Jul 18 21:14:18 2005 +0000
+++ b/sys/arch/evbppc/conf/WALNUT       Mon Jul 18 21:14:23 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: WALNUT,v 1.19.2.1 2005/06/01 17:19:50 riz Exp $
+#      $NetBSD: WALNUT,v 1.19.2.2 2005/07/18 21:14:23 riz Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -94,6 +94,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
diff -r 340ab125b646 -r 286fb9f3a5ad sys/arch/sun2/conf/DISKLESS
--- a/sys/arch/sun2/conf/DISKLESS       Mon Jul 18 21:14:18 2005 +0000
+++ b/sys/arch/sun2/conf/DISKLESS       Mon Jul 18 21:14:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.20 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: DISKLESS,v 1.20.2.1 2005/07/18 21:14:23 riz Exp $
 
 # DISKLESS Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, ec0
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "DISKLESS-$Revision: 1.20 $"
+#ident                 "DISKLESS-$Revision: 1.20.2.1 $"
 
 # Machines to be supported by this kernel
 #options       FPU_EMULATE
@@ -78,6 +78,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       GATEWAY         # IP packet forwarding
 #options       ISO,TPIP        # OSI networking