[src/netbsd-3]: src/sys/arch/hp300/conf Pull up revision 1.116 (requested by ...

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

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

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

diffstat:

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

diffs (26 lines):

diff -r 4adc87b8e5d9 -r eb001b549b63 sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC       Mon Jul 18 21:14:11 2005 +0000
+++ b/sys/arch/hp300/conf/GENERIC       Mon Jul 18 21:14:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113 2005/02/18 21:05:51 dsl Exp $
+# $NetBSD: GENERIC,v 1.113.4.1 2005/07/18 21:14:13 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.113 $"
+#ident                 "GENERIC-$Revision: 1.113.4.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -130,6 +130,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 forwarding + larger mb_map
 options        MROUTING        # Multicast routing