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

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

details:   https://anonhg.NetBSD.org/src/rev/6f3f83bfb2c7
branches:  netbsd-3
changeset: 576639:6f3f83bfb2c7
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:13:00 2005 +0000

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

diffstat:

 sys/arch/pdp10/conf/GENERIC |  5 +++--
 sys/arch/pmax/conf/WSCONS   |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r cfbe8e54ce89 -r 6f3f83bfb2c7 sys/arch/pdp10/conf/GENERIC
--- a/sys/arch/pdp10/conf/GENERIC       Mon Jul 18 21:12:59 2005 +0000
+++ b/sys/arch/pdp10/conf/GENERIC       Mon Jul 18 21:13:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.11 2005/02/18 21:05:53 dsl Exp $
+# $NetBSD: GENERIC,v 1.11.4.1 2005/07/18 21:13:00 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.11 $"
+#ident                 "GENERIC-$Revision: 1.11.4.1 $"
 
 # Here are all different supported CPU types listed.
 options        KL10
@@ -47,6 +47,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 cfbe8e54ce89 -r 6f3f83bfb2c7 sys/arch/pmax/conf/WSCONS
--- a/sys/arch/pmax/conf/WSCONS Mon Jul 18 21:12:59 2005 +0000
+++ b/sys/arch/pmax/conf/WSCONS Mon Jul 18 21:13:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.11 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: WSCONS,v 1.11.2.1 2005/07/18 21:13:00 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -33,7 +33,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.11 $"
+#ident         "GENERIC-$Revision: 1.11.2.1 $"
 
 maxusers       64
 
@@ -121,6 +121,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       MROUTING        # Multicast routing support