Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3]: src/sys/arch Pull up revision 1.36 (requested by tron in tick...
details: https://anonhg.NetBSD.org/src/rev/e147e34ee7a2
branches: netbsd-3
changeset: 576667:e147e34ee7a2
user: riz <riz%NetBSD.org@localhost>
date: Mon Jul 18 21:13:50 2005 +0000
description:
Pull up revision 1.36 (requested by tron in ticket #566):
Add (commented out) IPSEC_NAT_T option.
diffstat:
sys/arch/alpha/conf/BASIL | 5 +++--
sys/arch/amiga/conf/WSCONS | 5 +++--
sys/arch/arc/conf/MIMORI | 3 ++-
sys/arch/hpcarm/conf/IPAQ | 3 ++-
sys/arch/i386/conf/GENERIC_PS2TINY | 3 ++-
sys/arch/prep/conf/NATSUMI | 3 ++-
sys/arch/sparc64/conf/SPLODE | 5 +++--
7 files changed, 17 insertions(+), 10 deletions(-)
diffs (146 lines):
diff -r a039992bf124 -r e147e34ee7a2 sys/arch/alpha/conf/BASIL
--- a/sys/arch/alpha/conf/BASIL Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/alpha/conf/BASIL Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BASIL,v 1.32.2.2 2005/06/01 17:19:39 riz Exp $
+# $NetBSD: BASIL,v 1.32.2.3 2005/07/18 21:13:50 riz Exp $
#
# basil.shagadelic.org -- thorpej's API UP1000
@@ -6,7 +6,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "BASIL-$Revision: 1.32.2.2 $"
+#ident "BASIL-$Revision: 1.32.2.3 $"
maxusers 64
@@ -62,6 +62,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
# 4.3BSD compatibility. Should be optional, but necessary for now.
diff -r a039992bf124 -r e147e34ee7a2 sys/arch/amiga/conf/WSCONS
--- a/sys/arch/amiga/conf/WSCONS Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/amiga/conf/WSCONS Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.31 2005/02/25 13:49:07 simonb Exp $
+# $NetBSD: WSCONS,v 1.31.2.1 2005/07/18 21:13:50 riz Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.31 $"
+#ident "GENERIC-$Revision: 1.31.2.1 $"
maxusers 8
@@ -63,6 +63,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 # Packet forwarding
#options DIRECTED_BROADCAST # Broadcast across subnets
diff -r a039992bf124 -r e147e34ee7a2 sys/arch/arc/conf/MIMORI
--- a/sys/arch/arc/conf/MIMORI Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/arc/conf/MIMORI Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MIMORI,v 1.34.4.1 2005/06/01 17:19:40 riz Exp $
+# $NetBSD: MIMORI,v 1.34.4.2 2005/07/18 21:13:50 riz Exp $
# NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
#
# MIMORI -- My NEC RISCstation 2250 (ur)
@@ -93,6 +93,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 a039992bf124 -r e147e34ee7a2 sys/arch/hpcarm/conf/IPAQ
--- a/sys/arch/hpcarm/conf/IPAQ Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/hpcarm/conf/IPAQ Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IPAQ,v 1.35 2005/02/25 13:46:49 simonb Exp $
+# $NetBSD: IPAQ,v 1.35.2.1 2005/07/18 21:13:50 riz Exp $
#
# iPAQ H3600 -- Windows-CE based PDA
#
@@ -59,6 +59,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 a039992bf124 -r e147e34ee7a2 sys/arch/i386/conf/GENERIC_PS2TINY
--- a/sys/arch/i386/conf/GENERIC_PS2TINY Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.34 2005/02/18 21:05:52 dsl Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.34.4.1 2005/07/18 21:13:50 riz Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -114,6 +114,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 a039992bf124 -r e147e34ee7a2 sys/arch/prep/conf/NATSUMI
--- a/sys/arch/prep/conf/NATSUMI Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/prep/conf/NATSUMI Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NATSUMI,v 1.33.2.1 2005/04/17 11:42:44 tron Exp $
+# $NetBSD: NATSUMI,v 1.33.2.2 2005/07/18 21:13:50 riz Exp $
#
# for development
#
@@ -87,6 +87,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 a039992bf124 -r e147e34ee7a2 sys/arch/sparc64/conf/SPLODE
--- a/sys/arch/sparc64/conf/SPLODE Mon Jul 18 21:13:47 2005 +0000
+++ b/sys/arch/sparc64/conf/SPLODE Mon Jul 18 21:13:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SPLODE,v 1.33.2.2 2005/06/18 05:59:20 riz Exp $
+# $NetBSD: SPLODE,v 1.33.2.3 2005/07/18 21:13:50 riz Exp $
#
# Configuration for Ultra1, 32 bit mode.
@@ -6,7 +6,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.33.2.2 $"
+#ident "GENERIC-$Revision: 1.33.2.3 $"
maxusers 256
@@ -160,6 +160,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 # packet forwarding ("router switch")
#options MROUTING # packet forwarding of multicast packets
Home |
Main Index |
Thread Index |
Old Index