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

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

details:   https://anonhg.NetBSD.org/src/rev/156ad0e3bff6
branches:  netbsd-3
changeset: 576672:156ad0e3bff6
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:13:59 2005 +0000

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

diffstat:

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

diffs (43 lines):

diff -r e0447cecec2f -r 156ad0e3bff6 sys/arch/bebox/conf/GENERIC
--- a/sys/arch/bebox/conf/GENERIC       Mon Jul 18 21:13:58 2005 +0000
+++ b/sys/arch/bebox/conf/GENERIC       Mon Jul 18 21:13:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.80 2005/02/25 13:46:48 simonb Exp $
+# $NetBSD: GENERIC,v 1.80.2.1 2005/07/18 21:13:59 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.80 $"
+#ident                 "GENERIC-$Revision: 1.80.2.1 $"
 
 maxusers       32
 
@@ -85,6 +85,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       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
diff -r e0447cecec2f -r 156ad0e3bff6 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC        Mon Jul 18 21:13:58 2005 +0000
+++ b/sys/arch/cats/conf/GENERIC        Mon Jul 18 21:13:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.77.2.2 2005/06/01 17:19:38 riz Exp $
+# $NetBSD: GENERIC,v 1.77.2.3 2005/07/18 21:13:59 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -86,6 +86,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