[src/netbsd-3]: src/sys/arch/netwinder/conf Pull up revision 1.63 (requested ...

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

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

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

diffstat:

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

diffs (17 lines):

diff -r 49d31c5d9f6a -r 846869983d38 sys/arch/netwinder/conf/GENERIC
--- a/sys/arch/netwinder/conf/GENERIC   Mon Jul 18 21:13:16 2005 +0000
+++ b/sys/arch/netwinder/conf/GENERIC   Mon Jul 18 21:13:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.60 2005/03/11 07:07:50 matt Exp $
+# $NetBSD: GENERIC,v 1.60.2.1 2005/07/18 21:13:20 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -83,6 +83,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