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

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

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

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

diffstat:

 sys/arch/acorn32/conf/GENERIC   |  5 +++--
 sys/arch/dreamcast/conf/GENERIC |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 2e8175c9cb80 -r e4265bbb2827 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Mon Jul 18 21:14:08 2005 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Mon Jul 18 21:14:09 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.52 2005/02/18 21:05:50 dsl Exp $
+#      $NetBSD: GENERIC,v 1.52.4.1 2005/07/18 21:14:09 riz Exp $
 #
 #      GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.52 $"
+#ident         "GENERIC-$Revision: 1.52.4.1 $"
 
 # estimated number of users
 maxusers       32
@@ -80,6 +80,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 2e8175c9cb80 -r e4265bbb2827 sys/arch/dreamcast/conf/GENERIC
--- a/sys/arch/dreamcast/conf/GENERIC   Mon Jul 18 21:14:08 2005 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC   Mon Jul 18 21:14:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.53 2005/02/19 16:19:58 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.53.4.1 2005/07/18 21:14:09 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -104,6 +104,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