summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2013-06-05 23:07:59 +0000
committerchristos <christos@NetBSD.org>2013-06-05 23:07:59 +0000
commitd64bd205b2237eb8eda562e41533d13588bba2cf (patch)
treee48472783ab77d44f5480e518f30a65fe53c0806
parent006c33046fa5cac6f9485c7a2b157ca65f9effdf (diff)
remove obsolete networking options
-rw-r--r--sys/arch/acorn26/conf/FOURMEG3
-rw-r--r--sys/arch/acorn26/conf/GENERIC3
-rw-r--r--sys/arch/acorn26/conf/INSTALL3
-rw-r--r--sys/arch/acorn32/conf/EB7500ATX5
-rw-r--r--sys/arch/acorn32/conf/GENERIC5
-rw-r--r--sys/arch/acorn32/conf/INSTALL5
-rw-r--r--sys/arch/acorn32/conf/LOWMEM_WSCONS3
-rw-r--r--sys/arch/acorn32/conf/NC3
-rw-r--r--sys/arch/algor/conf/P40325
-rw-r--r--sys/arch/algor/conf/P50645
-rw-r--r--sys/arch/algor/conf/P60325
-rw-r--r--sys/arch/alpha/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/XEN3_DOM03
-rw-r--r--sys/arch/amd64/conf/XEN3_DOMU3
-rw-r--r--sys/arch/amiga/conf/DRACO5
-rw-r--r--sys/arch/amiga/conf/GENERIC5
-rw-r--r--sys/arch/amiga/conf/GENERIC.in5
-rw-r--r--sys/arch/amiga/conf/INSTALL5
-rw-r--r--sys/arch/amigappc/conf/GENERIC5
-rw-r--r--sys/arch/amigappc/conf/NULL5
-rw-r--r--sys/arch/arc/conf/ARCTIC3
-rw-r--r--sys/arch/arc/conf/GENERIC5
-rw-r--r--sys/arch/arc/conf/M4033
-rw-r--r--sys/arch/arc/conf/MIMORI3
-rw-r--r--sys/arch/arc/conf/PICA3
-rw-r--r--sys/arch/arc/conf/RPC445
-rw-r--r--sys/arch/atari/conf/GENERIC.in3
-rw-r--r--sys/arch/bebox/conf/GENERIC5
-rw-r--r--sys/arch/cats/conf/GENERIC3
-rw-r--r--sys/arch/cats/conf/INSTALL3
-rw-r--r--sys/arch/cobalt/conf/GENERIC5
-rw-r--r--sys/arch/cobalt/conf/INSTALL5
-rw-r--r--sys/arch/dreamcast/conf/GENERIC3
-rw-r--r--sys/arch/emips/conf/GENERIC5
-rw-r--r--sys/arch/evbarm/conf/ADI_BRH3
-rw-r--r--sys/arch/evbarm/conf/ARMADAXP6
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO2103
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO93
-rw-r--r--sys/arch/evbarm/conf/BCM5301X6
-rw-r--r--sys/arch/evbarm/conf/BEAGLEBOARD6
-rw-r--r--sys/arch/evbarm/conf/BEAGLEBOARDXM6
-rw-r--r--sys/arch/evbarm/conf/BEAGLEBONE6
-rw-r--r--sys/arch/evbarm/conf/CP31006
-rw-r--r--sys/arch/evbarm/conf/GEMINI4
-rw-r--r--sys/arch/evbarm/conf/GEMINI_MASTER4
-rw-r--r--sys/arch/evbarm/conf/GEMINI_SLAVE4
-rw-r--r--sys/arch/evbarm/conf/GOLDENGATE8
-rw-r--r--sys/arch/evbarm/conf/GUMSTIX3
-rw-r--r--sys/arch/evbarm/conf/HDL_G3
-rw-r--r--sys/arch/evbarm/conf/HPT53253
-rw-r--r--sys/arch/evbarm/conf/IGEPV26
-rw-r--r--sys/arch/evbarm/conf/IMX31LITE3
-rw-r--r--sys/arch/evbarm/conf/INTEGRATOR3
-rw-r--r--sys/arch/evbarm/conf/INTEGRATOR_CP5
-rw-r--r--sys/arch/evbarm/conf/IQ312443
-rw-r--r--sys/arch/evbarm/conf/IQ803103
-rw-r--r--sys/arch/evbarm/conf/IQ803213
-rw-r--r--sys/arch/evbarm/conf/IXDP4253
-rw-r--r--sys/arch/evbarm/conf/IXM12003
-rw-r--r--sys/arch/evbarm/conf/LUBBOCK1
-rw-r--r--sys/arch/evbarm/conf/MARVELL_NAS3
-rw-r--r--sys/arch/evbarm/conf/MINI24403
-rw-r--r--sys/arch/evbarm/conf/MMNET_GENERIC5
-rw-r--r--sys/arch/evbarm/conf/MPCSA_GENERIC5
-rw-r--r--sys/arch/evbarm/conf/MV21203
-rw-r--r--sys/arch/evbarm/conf/N9006
-rw-r--r--sys/arch/evbarm/conf/NAPPI3
-rw-r--r--sys/arch/evbarm/conf/NETWALKER3
-rw-r--r--sys/arch/evbarm/conf/OSK59124
-rw-r--r--sys/arch/evbarm/conf/OVERO6
-rw-r--r--sys/arch/evbarm/conf/PANDABOARD6
-rw-r--r--sys/arch/evbarm/conf/RPI6
-rw-r--r--sys/arch/evbarm/conf/SHEEVAPLUG3
-rw-r--r--sys/arch/evbarm/conf/SMDK24103
-rw-r--r--sys/arch/evbarm/conf/SMDK28003
-rw-r--r--sys/arch/evbarm/conf/TEAMASA_NPWR3
-rw-r--r--sys/arch/evbarm/conf/TEAMASA_NPWR_FC3
-rw-r--r--sys/arch/evbarm/conf/TISDP24206
-rw-r--r--sys/arch/evbarm/conf/TISDP24306
-rw-r--r--sys/arch/evbarm/conf/TS72003
-rw-r--r--sys/arch/evbarm/conf/TWINTAIL3
-rw-r--r--sys/arch/evbarm/conf/VIPER3
-rw-r--r--sys/arch/evbarm/conf/ZAO4253
-rw-r--r--sys/arch/evbmips/conf/ADM51207
-rw-r--r--sys/arch/evbmips/conf/ADM5120-NB7
-rw-r--r--sys/arch/evbmips/conf/ADM5120-USB7
-rw-r--r--sys/arch/evbmips/conf/ALCHEMY5
-rw-r--r--sys/arch/evbmips/conf/AP305
-rw-r--r--sys/arch/evbmips/conf/CPMBR14001
-rw-r--r--sys/arch/evbmips/conf/DB1205
-rw-r--r--sys/arch/evbmips/conf/GDIUM5
-rw-r--r--sys/arch/evbmips/conf/LOONGSON5
-rw-r--r--sys/arch/evbmips/conf/MALTA5
-rw-r--r--sys/arch/evbmips/conf/MERAKI8
-rw-r--r--sys/arch/evbmips/conf/RB1537
-rw-r--r--sys/arch/evbmips/conf/RB433UAH5
-rw-r--r--sys/arch/evbmips/conf/WGT624V35
-rw-r--r--sys/arch/evbmips/conf/XLSATX5
-rw-r--r--sys/arch/evbppc/conf/EV642603
-rw-r--r--sys/arch/evbppc/conf/EXPLORA4513
-rw-r--r--sys/arch/evbppc/conf/MPC8536DS5
-rw-r--r--sys/arch/evbppc/conf/MPC8548CDS5
-rw-r--r--sys/arch/evbppc/conf/OPENBLOCKS2003
-rw-r--r--sys/arch/evbppc/conf/OPENBLOCKS6005
-rw-r--r--sys/arch/evbppc/conf/P2020DS5
-rw-r--r--sys/arch/evbppc/conf/P2020RDB5
-rw-r--r--sys/arch/evbppc/conf/PMPPC3
-rw-r--r--sys/arch/evbppc/conf/RB8005
-rw-r--r--sys/arch/evbppc/conf/TWRP10255
-rw-r--r--sys/arch/evbppc/conf/VIRTEX_DFC6
-rw-r--r--sys/arch/evbppc/conf/VIRTEX_GSRD16
-rw-r--r--sys/arch/evbppc/conf/VIRTEX_GSRD26
-rw-r--r--sys/arch/evbppc/conf/WALNUT3
-rw-r--r--sys/arch/ews4800mips/conf/GENERIC5
-rw-r--r--sys/arch/hp300/conf/GENERIC5
-rw-r--r--sys/arch/hp300/conf/INSTALL3
-rw-r--r--sys/arch/hp700/conf/GENERIC5
-rw-r--r--sys/arch/hpcarm/conf/IPAQ3
-rw-r--r--sys/arch/hpcarm/conf/JORNADA7205
-rw-r--r--sys/arch/hpcarm/conf/JORNADA8205
-rw-r--r--sys/arch/hpcarm/conf/NETBOOKPRO5
-rw-r--r--sys/arch/hpcarm/conf/WZERO35
-rw-r--r--sys/arch/hpcmips/conf/GENERIC5
-rw-r--r--sys/arch/hpcmips/conf/LROUTER3
-rw-r--r--sys/arch/hpcmips/conf/MPC3035
-rw-r--r--sys/arch/hpcmips/conf/TX39123
-rw-r--r--sys/arch/hpcmips/conf/TX39223
-rw-r--r--sys/arch/hpcmips/conf/VR41XX5
-rw-r--r--sys/arch/i386/conf/ALL5
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERIC_PS2TINY3
-rw-r--r--sys/arch/i386/conf/NET45015
-rw-r--r--sys/arch/i386/conf/XEN3_DOM03
-rw-r--r--sys/arch/i386/conf/XEN3_DOMU3
-rw-r--r--sys/arch/iyonix/conf/GENERIC5
-rw-r--r--sys/arch/luna68k/conf/GENERIC5
-rw-r--r--sys/arch/luna68k/conf/INSTALL3
-rw-r--r--sys/arch/mac68k/conf/GENERIC5
-rw-r--r--sys/arch/mipsco/conf/RC32303
-rw-r--r--sys/arch/mmeye/conf/GENERIC5
-rw-r--r--sys/arch/mmeye/conf/MMEYE_WLF5
-rw-r--r--sys/arch/mvme68k/conf/GENERIC5
-rw-r--r--sys/arch/mvmeppc/conf/GENERIC5
-rw-r--r--sys/arch/netwinder/conf/GENERIC3
-rw-r--r--sys/arch/news68k/conf/GENERIC5
-rw-r--r--sys/arch/news68k/conf/GENERIC_TINY5
-rw-r--r--sys/arch/news68k/conf/LIBERO3
-rw-r--r--sys/arch/news68k/conf/NEWS12003
-rw-r--r--sys/arch/newsmips/conf/GENERIC5
-rw-r--r--sys/arch/next68k/conf/GENERIC5
-rw-r--r--sys/arch/next68k/conf/SLAB3
-rw-r--r--sys/arch/ofppc/conf/GENERIC5
-rw-r--r--sys/arch/pmax/conf/GENERIC5
-rw-r--r--sys/arch/pmax/conf/GENERIC645
-rw-r--r--sys/arch/prep/conf/GENERIC5
-rw-r--r--sys/arch/rs6000/conf/GENERIC5
-rw-r--r--sys/arch/sandpoint/conf/GENERIC5
-rw-r--r--sys/arch/sbmips/conf/GENERIC5
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP125
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP2x5
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP3x5
-rw-r--r--sys/arch/shark/conf/GENERIC5
-rw-r--r--sys/arch/sparc/conf/GENERIC5
-rw-r--r--sys/arch/sparc/conf/KRUPS5
-rw-r--r--sys/arch/sparc/conf/MRCOFFEE5
-rw-r--r--sys/arch/sparc64/conf/GENERIC5
-rw-r--r--sys/arch/sparc64/conf/NONPLUS645
-rw-r--r--sys/arch/sun2/conf/FOURMEG5
-rw-r--r--sys/arch/sun2/conf/GENERIC5
-rw-r--r--sys/arch/sun2/conf/INSTALL5
-rw-r--r--sys/arch/sun2/conf/RAMDISK3
-rw-r--r--sys/arch/sun2/conf/VME5
-rw-r--r--sys/arch/sun3/conf/GENERIC5
-rw-r--r--sys/arch/sun3/conf/GENERIC3X5
-rw-r--r--sys/arch/vax/conf/GENERIC8
-rw-r--r--sys/arch/vax/conf/VAX7805
-rw-r--r--sys/arch/x68k/conf/GENERIC5
-rw-r--r--sys/arch/x68k/conf/INSTALL5
179 files changed, 265 insertions, 527 deletions
diff --git a/sys/arch/acorn26/conf/FOURMEG b/sys/arch/acorn26/conf/FOURMEG
index e5b092fa070..5d635fc1a7d 100644
--- a/sys/arch/acorn26/conf/FOURMEG
+++ b/sys/arch/acorn26/conf/FOURMEG
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.45 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: FOURMEG,v 1.46 2013/06/05 23:07:59 christos Exp $
# FOURMEG arm26 configuration -- something small
@@ -64,7 +64,6 @@ options EXEC_SCRIPT
options INET # Internet protocol suite
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn26/conf/GENERIC b/sys/arch/acorn26/conf/GENERIC
index 1362eabf85c..cbc778f4df4 100644
--- a/sys/arch/acorn26/conf/GENERIC
+++ b/sys/arch/acorn26/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.73 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: GENERIC,v 1.74 2013/06/05 23:07:59 christos Exp $
#
# GENERIC machine description file
#
@@ -82,7 +82,6 @@ options GATEWAY # packet forwarding
options INET # Internet protocol suite
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn26/conf/INSTALL b/sys/arch/acorn26/conf/INSTALL
index 463ffaa2321..bf6e88deca7 100644
--- a/sys/arch/acorn26/conf/INSTALL
+++ b/sys/arch/acorn26/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.40 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: INSTALL,v 1.41 2013/06/05 23:07:59 christos Exp $
# INSTALL configuration, used to generate installation media
@@ -63,7 +63,6 @@ options EXEC_SCRIPT
options INET # Internet protocol suite
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX
index 942c6de5bb8..37e7dcd3b72 100644
--- a/sys/arch/acorn32/conf/EB7500ATX
+++ b/sys/arch/acorn32/conf/EB7500ATX
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.53 2013/04/27 21:43:10 christos Exp $
+# $NetBSD: EB7500ATX,v 1.54 2013/06/05 23:07:59 christos Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.53 $"
+#ident "EB7500ATX-$Revision: 1.54 $"
# estimated number of users
maxusers 32
@@ -72,7 +72,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index 2bf6fe50f54..cdabe4a0798 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.109 2013/04/27 21:43:10 christos Exp $
+# $NetBSD: GENERIC,v 1.110 2013/06/05 23:07:59 christos Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.109 $"
+#ident "GENERIC-$Revision: 1.110 $"
# estimated number of users
maxusers 32
@@ -80,7 +80,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index 0b7526f1eeb..335a797352b 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.68 2013/04/27 21:43:10 christos Exp $
+# $NetBSD: INSTALL,v 1.69 2013/06/05 23:07:59 christos Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.68 $"
+#ident "INSTALL-$Revision: 1.69 $"
# estimated number of users
maxusers 32
@@ -76,7 +76,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index 0d3b4ded69a..f69ddd0ef96 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.62 2013/04/27 18:19:21 christos Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.63 2013/06/05 23:07:59 christos Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -60,7 +60,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index d5888f2426c..beda47b6290 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.60 2013/04/27 18:19:21 christos Exp $
+# $NetBSD: NC,v 1.61 2013/06/05 23:07:59 christos Exp $
#
# NC - with wscons
#
@@ -53,7 +53,6 @@ file-system PTYFS # /dev/pts/N support
#options GATEWAY # packet forwarding
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options INET # IP + ICMP + TCP + UDP
#options MROUTING # IP multicast routing
diff --git a/sys/arch/algor/conf/P4032 b/sys/arch/algor/conf/P4032
index 29d0b04d3d2..c7d213f49d3 100644
--- a/sys/arch/algor/conf/P4032
+++ b/sys/arch/algor/conf/P4032
@@ -1,4 +1,4 @@
-# $NetBSD: P4032,v 1.68 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: P4032,v 1.69 2013/06/05 23:07:59 christos Exp $
#
# Algorithmics P-4032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P4032-$Revision: 1.68 $"
+#ident "P4032-$Revision: 1.69 $"
maxusers 32
@@ -54,7 +54,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocol suite
options INET6 # IPV6
options IPSEC # IP security
-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 --git a/sys/arch/algor/conf/P5064 b/sys/arch/algor/conf/P5064
index b02d4bcd719..35ec616f6c4 100644
--- a/sys/arch/algor/conf/P5064
+++ b/sys/arch/algor/conf/P5064
@@ -1,4 +1,4 @@
-# $NetBSD: P5064,v 1.78 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: P5064,v 1.79 2013/06/05 23:07:59 christos Exp $
#
# Algorithmics P-5064 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.78 $"
+#ident "P5064-$Revision: 1.79 $"
maxusers 32
@@ -49,7 +49,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocol suite
options INET6 # IPV6
options IPSEC # IP security
-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 --git a/sys/arch/algor/conf/P6032 b/sys/arch/algor/conf/P6032
index 7998393f58e..ef724d02df8 100644
--- a/sys/arch/algor/conf/P6032
+++ b/sys/arch/algor/conf/P6032
@@ -1,4 +1,4 @@
-# $NetBSD: P6032,v 1.69 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: P6032,v 1.70 2013/06/05 23:07:59 christos Exp $
#
# Algorithmics P-6032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P6032-$Revision: 1.69 $"
+#ident "P6032-$Revision: 1.70 $"
maxusers 32
@@ -49,7 +49,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocol suite
options INET6 # IPV6
options IPSEC # IP security
-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 --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 968ed76bc55..3de37a2dedb 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.351 2013/04/27 22:21:12 christos Exp $
+# $NetBSD: GENERIC,v 1.352 2013/06/05 23:08:00 christos Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.351 $"
+ident "GENERIC-$Revision: 1.352 $"
maxusers 32
@@ -104,7 +104,6 @@ options NFSSERVER # Sun NFS-compatible file system server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index fbb86161d74..0357e94e30a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.376 2013/06/04 14:39:31 christos Exp $
+# $NetBSD: GENERIC,v 1.377 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.376 $"
+#ident "GENERIC-$Revision: 1.377 $"
maxusers 64 # estimated number of users
@@ -177,7 +177,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MPLS # MultiProtocol Label Switching (needs ifmpls)
#options MROUTING # IP multicast routing
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 183431d3e1d..1ed30803da2 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.96 2013/04/27 21:43:14 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.97 2013/06/05 23:08:00 christos Exp $
include "arch/amd64/conf/std.xen"
@@ -122,7 +122,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amd64/conf/XEN3_DOMU b/sys/arch/amd64/conf/XEN3_DOMU
index ecedf2b8a6b..1f62be2ec89 100644
--- a/sys/arch/amd64/conf/XEN3_DOMU
+++ b/sys/arch/amd64/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.48 2013/04/27 21:43:14 christos Exp $
+# $NetBSD: XEN3_DOMU,v 1.49 2013/06/05 23:08:00 christos Exp $
include "arch/amd64/conf/std.xen"
@@ -116,7 +116,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index 8ec84ea62db..8ca99a4c1e6 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.169 2013/04/27 21:43:14 christos Exp $
+# $NetBSD: DRACO,v 1.170 2013/06/05 23:08:00 christos Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.169 $"
+#ident "GENERIC-$Revision: 1.170 $"
maxusers 8
@@ -51,7 +51,6 @@ options M060SP # MC68060 software support (Required for 060)
options INET # IP networking support (Required)
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index c938dec3d49..7e6bc7a074a 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.301 2013/04/27 21:43:15 christos Exp $
+# $NetBSD: GENERIC,v 1.302 2013/06/05 23:08:00 christos Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.301 $"
+#ident "GENERIC-$Revision: 1.302 $"
maxusers 8
@@ -63,7 +63,6 @@ options FPU_EMULATE # FPU emulation
options INET # IP networking support (Required)
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in
index 4cdcdc16b93..7bf038a925f 100644
--- a/sys/arch/amiga/conf/GENERIC.in
+++ b/sys/arch/amiga/conf/GENERIC.in
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.116 2013/04/27 22:29:56 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.117 2013/06/05 23:08:00 christos Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.116 $"
+#ident "GENERIC-$Revision: 1.117 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -95,7 +95,6 @@ options FPU_EMULATE # FPU emulation
options INET # IP networking support (Required)
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amiga/conf/INSTALL b/sys/arch/amiga/conf/INSTALL
index 60b61c8ee8a..b8139a77c6a 100644
--- a/sys/arch/amiga/conf/INSTALL
+++ b/sys/arch/amiga/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.119 2013/04/27 21:43:15 christos Exp $
+# $NetBSD: INSTALL,v 1.120 2013/06/05 23:08:00 christos Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.119 $"
+#ident "GENERIC-$Revision: 1.120 $"
makeoptions COPTS="-Os"
@@ -64,7 +64,6 @@ options FPU_EMULATE # FPU emulation
options INET # IP networking support (Required)
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/amigappc/conf/GENERIC b/sys/arch/amigappc/conf/GENERIC
index 3fd5c0ebfed..6aac57aea9f 100644
--- a/sys/arch/amigappc/conf/GENERIC
+++ b/sys/arch/amigappc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.17 2013/04/27 21:43:16 christos Exp $
+# $NetBSD: GENERIC,v 1.18 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.17 $"
+#ident "GENERIC-$Revision: 1.18 $"
maxusers 8
@@ -138,7 +138,6 @@ options NFSSERVER # Network File System server side code
options INET # IP networking support (Required)
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing
#options DIRECTED_BROADCAST # Broadcast across subnets
diff --git a/sys/arch/amigappc/conf/NULL b/sys/arch/amigappc/conf/NULL
index 639e412182f..e8648ab61d5 100644
--- a/sys/arch/amigappc/conf/NULL
+++ b/sys/arch/amigappc/conf/NULL
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.40 2013/04/27 21:43:16 christos Exp $
+# $NetBSD: NULL,v 1.41 2013/06/05 23:08:00 christos Exp $
#
# NULL machine description file
#
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.40 $"
+#ident "GENERIC-$Revision: 1.41 $"
maxusers 8
@@ -122,7 +122,6 @@ file-system TMPFS # Efficient memory file-system
options INET # IP networking support (Required)
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC
index 32068a4246f..0815f29c1ba 100644
--- a/sys/arch/arc/conf/ARCTIC
+++ b/sys/arch/arc/conf/ARCTIC
@@ -1,4 +1,4 @@
-# $NetBSD: ARCTIC,v 1.63 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: ARCTIC,v 1.64 2013/06/05 23:08:00 christos Exp $
# $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
#
# configuration file for DeskStation
@@ -97,7 +97,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index f33e3f2de96..2bf9da021d0 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.177 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: GENERIC,v 1.178 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.177 $"
+#ident "GENERIC-$Revision: 1.178 $"
maxusers 32 # estimated number of users
@@ -133,7 +133,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/arc/conf/M403 b/sys/arch/arc/conf/M403
index 3cd2c1fd190..859ccb9dc71 100644
--- a/sys/arch/arc/conf/M403
+++ b/sys/arch/arc/conf/M403
@@ -1,4 +1,4 @@
-# $NetBSD: M403,v 1.59 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: M403,v 1.60 2013/06/05 23:08:00 christos Exp $
#
# configuration file for MIPS Magnum 4000 system
#
@@ -90,7 +90,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI
index d9654c633bd..01ceb5f4c0f 100644
--- a/sys/arch/arc/conf/MIMORI
+++ b/sys/arch/arc/conf/MIMORI
@@ -1,4 +1,4 @@
-# $NetBSD: MIMORI,v 1.64 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: MIMORI,v 1.65 2013/06/05 23:08:00 christos Exp $
# NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
#
# MIMORI -- My NEC RISCstation 2250 (ur)
@@ -92,7 +92,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
options IPSEC # IP security
-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 --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index b85d1a934b4..473d5bc6622 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -1,4 +1,4 @@
-# $NetBSD: PICA,v 1.76 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: PICA,v 1.77 2013/06/05 23:08:00 christos Exp $
#
# configuration file for ACER PICA system
#
@@ -91,7 +91,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/arc/conf/RPC44 b/sys/arch/arc/conf/RPC44
index 2060762ee5e..75c92477e23 100644
--- a/sys/arch/arc/conf/RPC44
+++ b/sys/arch/arc/conf/RPC44
@@ -1,4 +1,4 @@
-# $NetBSD: RPC44,v 1.46 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: RPC44,v 1.47 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.46 $"
+#ident "GENERIC-$Revision: 1.47 $"
maxusers 32 # estimated number of users
@@ -118,7 +118,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in
index c5c90fe98da..867bd906167 100644
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.103 2013/04/27 21:43:18 christos Exp $
+# $NetBSD: GENERIC.in,v 1.104 2013/06/05 23:08:00 christos Exp $
#
# Generic atari
#
@@ -66,7 +66,6 @@ options INET # IP + ICMP + TCP + UDP
#if !defined(SMALL030_KERNEL)
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # packet forwarding
#options MROUTING # IP multicast routing
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index 162a37f3241..79174cce075 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.138 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: GENERIC,v 1.139 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.138 $"
+#ident "GENERIC-$Revision: 1.139 $"
maxusers 32
@@ -113,7 +113,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index c32b624f7c5..d197ce4aa67 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.147 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: GENERIC,v 1.148 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -88,7 +88,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL
index 6be49ae15d5..6411a9b64aa 100644
--- a/sys/arch/cats/conf/INSTALL
+++ b/sys/arch/cats/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.88 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: INSTALL,v 1.89 2013/06/05 23:08:00 christos Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -58,7 +58,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index c8b42a60548..90dbd084711 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.140 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: GENERIC,v 1.141 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.140 $"
+#ident "GENERIC-$Revision: 1.141 $"
maxusers 32
@@ -107,7 +107,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL
index 53227109997..d9529e70e3a 100644
--- a/sys/arch/cobalt/conf/INSTALL
+++ b/sys/arch/cobalt/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.53 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: INSTALL,v 1.54 2013/06/05 23:08:00 christos Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.53 $"
+#ident "INSTALL-$Revision: 1.54 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -95,7 +95,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/dreamcast/conf/GENERIC b/sys/arch/dreamcast/conf/GENERIC
index 8e578591ed2..7b586222370 100644
--- a/sys/arch/dreamcast/conf/GENERIC
+++ b/sys/arch/dreamcast/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113 2013/04/27 21:43:20 christos Exp $
+# $NetBSD: GENERIC,v 1.114 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -104,7 +104,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/emips/conf/GENERIC b/sys/arch/emips/conf/GENERIC
index 9fdc45d23e8..cc59bc7f86a 100644
--- a/sys/arch/emips/conf/GENERIC
+++ b/sys/arch/emips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.10 2013/04/27 21:43:20 christos Exp $
+# $NetBSD: GENERIC,v 1.11 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/emips/conf/std.emips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
maxusers 64
@@ -99,7 +99,6 @@ options FFS_EI # FFS Endian Independent support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # Multicast routing support
diff --git a/sys/arch/evbarm/conf/ADI_BRH b/sys/arch/evbarm/conf/ADI_BRH
index 9ae9e9c8e55..c8442838ca2 100644
--- a/sys/arch/evbarm/conf/ADI_BRH
+++ b/sys/arch/evbarm/conf/ADI_BRH
@@ -1,4 +1,4 @@
-# $NetBSD: ADI_BRH,v 1.62 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: ADI_BRH,v 1.63 2013/06/05 23:08:00 christos Exp $
#
# ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
#
@@ -59,7 +59,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/ARMADAXP b/sys/arch/evbarm/conf/ARMADAXP
index 09993c7d427..7705be60bb5 100644
--- a/sys/arch/evbarm/conf/ARMADAXP
+++ b/sys/arch/evbarm/conf/ARMADAXP
@@ -1,5 +1,5 @@
#
-# $NetBSD: ARMADAXP,v 1.2 2013/06/03 14:50:59 rkujawa Exp $
+# $NetBSD: ARMADAXP,v 1.3 2013/06/05 23:08:00 christos Exp $
#
# ARMADA XP DEV BOARD
#
@@ -58,13 +58,9 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
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
-options ISO,TPIP # OSI
-options EON # OSI tunneling over IP
options NETATALK # AppleTalk networking
options PFIL_HOOKS # pfil(9) packet filter hooks
options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/ARMADILLO210 b/sys/arch/evbarm/conf/ARMADILLO210
index 0732452b996..1ac829d1c66 100644
--- a/sys/arch/evbarm/conf/ARMADILLO210
+++ b/sys/arch/evbarm/conf/ARMADILLO210
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO210,v 1.27 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: ARMADILLO210,v 1.28 2013/06/05 23:08:00 christos Exp $
#
# ARMADILLO210 -- Atmark Techno, Armadillo-210
#
@@ -54,7 +54,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/ARMADILLO9 b/sys/arch/evbarm/conf/ARMADILLO9
index c8b8b247d93..2b7d115ab1f 100644
--- a/sys/arch/evbarm/conf/ARMADILLO9
+++ b/sys/arch/evbarm/conf/ARMADILLO9
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.41 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: ARMADILLO9,v 1.42 2013/06/05 23:08:00 christos Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -54,7 +54,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/BCM5301X b/sys/arch/evbarm/conf/BCM5301X
index fd8de7063d3..a566ec5ca1a 100644
--- a/sys/arch/evbarm/conf/BCM5301X
+++ b/sys/arch/evbarm/conf/BCM5301X
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM5301X,v 1.13 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: BCM5301X,v 1.14 2013/06/05 23:08:00 christos Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -65,13 +65,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/BEAGLEBOARD b/sys/arch/evbarm/conf/BEAGLEBOARD
index c442c8d55c9..d887ee8215c 100644
--- a/sys/arch/evbarm/conf/BEAGLEBOARD
+++ b/sys/arch/evbarm/conf/BEAGLEBOARD
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARD,v 1.48 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: BEAGLEBOARD,v 1.49 2013/06/05 23:08:00 christos Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -58,13 +58,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/BEAGLEBOARDXM b/sys/arch/evbarm/conf/BEAGLEBOARDXM
index 3cad8de4a65..a3c9b68023a 100644
--- a/sys/arch/evbarm/conf/BEAGLEBOARDXM
+++ b/sys/arch/evbarm/conf/BEAGLEBOARDXM
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARDXM,v 1.10 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: BEAGLEBOARDXM,v 1.11 2013/06/05 23:08:00 christos Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -57,13 +57,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/BEAGLEBONE b/sys/arch/evbarm/conf/BEAGLEBONE
index 6d240776cb4..3189937dd32 100644
--- a/sys/arch/evbarm/conf/BEAGLEBONE
+++ b/sys/arch/evbarm/conf/BEAGLEBONE
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBONE,v 1.13 2013/05/03 15:46:53 jakllsch Exp $
+# $NetBSD: BEAGLEBONE,v 1.14 2013/06/05 23:08:00 christos Exp $
#
# BEAGLEBONE -- TI AM335x board Kernel
#
@@ -61,13 +61,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/CP3100 b/sys/arch/evbarm/conf/CP3100
index 78e2709abbc..c99ad82c8c6 100644
--- a/sys/arch/evbarm/conf/CP3100
+++ b/sys/arch/evbarm/conf/CP3100
@@ -1,4 +1,4 @@
-# $NetBSD: CP3100,v 1.34 2013/04/27 21:43:20 christos Exp $
+# $NetBSD: CP3100,v 1.35 2013/06/05 23:08:00 christos Exp $
#
# CP3100 -- Certance CP3100 Kernel
#
@@ -59,13 +59,9 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/GEMINI b/sys/arch/evbarm/conf/GEMINI
index 982bd095529..35cf79de664 100644
--- a/sys/arch/evbarm/conf/GEMINI
+++ b/sys/arch/evbarm/conf/GEMINI
@@ -54,13 +54,9 @@ file-system PTYFS # /dev/pts/N support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/GEMINI_MASTER b/sys/arch/evbarm/conf/GEMINI_MASTER
index d1e97aeebb0..ddebe45a1c5 100644
--- a/sys/arch/evbarm/conf/GEMINI_MASTER
+++ b/sys/arch/evbarm/conf/GEMINI_MASTER
@@ -55,13 +55,9 @@ file-system PTYFS # /dev/pts/N support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/GEMINI_SLAVE b/sys/arch/evbarm/conf/GEMINI_SLAVE
index 3030189314e..21c825c4611 100644
--- a/sys/arch/evbarm/conf/GEMINI_SLAVE
+++ b/sys/arch/evbarm/conf/GEMINI_SLAVE
@@ -54,13 +54,9 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/GOLDENGATE b/sys/arch/evbarm/conf/GOLDENGATE
index 0d4ec192e11..5eb8e269056 100644
--- a/sys/arch/evbarm/conf/GOLDENGATE
+++ b/sys/arch/evbarm/conf/GOLDENGATE
@@ -1,5 +1,5 @@
#
-# $NetBSD: GOLDENGATE,v 1.3 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: GOLDENGATE,v 1.4 2013/06/05 23:08:00 christos Exp $
#
# GOLDENGATE -- Cortina GOLDENGATE Eval Board Kernel
#
@@ -63,15 +63,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options ISO,TPIP # OSI
-#options EON # OSI tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/GUMSTIX b/sys/arch/evbarm/conf/GUMSTIX
index 05b340bd002..b8e827623e9 100644
--- a/sys/arch/evbarm/conf/GUMSTIX
+++ b/sys/arch/evbarm/conf/GUMSTIX
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.75 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: GUMSTIX,v 1.76 2013/06/05 23:08:00 christos Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -78,7 +78,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
-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 --git a/sys/arch/evbarm/conf/HDL_G b/sys/arch/evbarm/conf/HDL_G
index a49169caee7..b16ab6cde22 100644
--- a/sys/arch/evbarm/conf/HDL_G
+++ b/sys/arch/evbarm/conf/HDL_G
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.36 2013/04/27 21:43:21 christos Exp $
+# $NetBSD: HDL_G,v 1.37 2013/06/05 23:08:00 christos Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -65,7 +65,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/HPT5325 b/sys/arch/evbarm/conf/HPT5325
index abcb4e66fe8..8a48ff3cc1b 100644
--- a/sys/arch/evbarm/conf/HPT5325
+++ b/sys/arch/evbarm/conf/HPT5325
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.13 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: HPT5325,v 1.14 2013/06/05 23:08:00 christos Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -74,7 +74,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/IGEPV2 b/sys/arch/evbarm/conf/IGEPV2
index 78db2199334..c37d3cb06ce 100644
--- a/sys/arch/evbarm/conf/IGEPV2
+++ b/sys/arch/evbarm/conf/IGEPV2
@@ -1,5 +1,5 @@
#
-# $NetBSD: IGEPV2,v 1.17 2013/04/27 22:21:13 christos Exp $
+# $NetBSD: IGEPV2,v 1.18 2013/06/05 23:08:00 christos Exp $
#
# IGEPv2 -- TI OMAP 3530 Eval Board Kernel
#
@@ -58,13 +58,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/IMX31LITE b/sys/arch/evbarm/conf/IMX31LITE
index 75957d33107..0f1ce762bb2 100644
--- a/sys/arch/evbarm/conf/IMX31LITE
+++ b/sys/arch/evbarm/conf/IMX31LITE
@@ -1,4 +1,4 @@
-# $NetBSD: IMX31LITE,v 1.22 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: IMX31LITE,v 1.23 2013/06/05 23:08:00 christos Exp $
#
# IMX31LITE -- Freescale IMX31LITE Evaluation Board Kernel
#
@@ -58,7 +58,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR
index 3e821a1f7c3..fa79d0c04c2 100644
--- a/sys/arch/evbarm/conf/INTEGRATOR
+++ b/sys/arch/evbarm/conf/INTEGRATOR
@@ -1,4 +1,4 @@
-# $NetBSD: INTEGRATOR,v 1.73 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: INTEGRATOR,v 1.74 2013/06/05 23:08:00 christos Exp $
#
# GENERIC -- ARM Integrator board Generic kernel
#
@@ -59,7 +59,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/INTEGRATOR_CP b/sys/arch/evbarm/conf/INTEGRATOR_CP
index 0c178412a01..8a99d6399c0 100644
--- a/sys/arch/evbarm/conf/INTEGRATOR_CP
+++ b/sys/arch/evbarm/conf/INTEGRATOR_CP
@@ -1,4 +1,4 @@
-# $NetBSD: INTEGRATOR_CP,v 1.3 2013/03/14 10:06:45 joerg Exp $
+# $NetBSD: INTEGRATOR_CP,v 1.4 2013/06/05 23:08:00 christos Exp $
#
# INTEGRATOR_CP -- ARM Integrator CP kernel
#
@@ -58,12 +58,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options ISO,TPIP # OSI
-#options EON # OSI tunneling over IP
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/IQ31244 b/sys/arch/evbarm/conf/IQ31244
index 65fa847f8ba..c26a550324f 100644
--- a/sys/arch/evbarm/conf/IQ31244
+++ b/sys/arch/evbarm/conf/IQ31244
@@ -1,4 +1,4 @@
-# $NetBSD: IQ31244,v 1.62 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: IQ31244,v 1.63 2013/06/05 23:08:00 christos Exp $
#
# IQ31244 -- Intel IQ31244 Evaluation Board Kernel
#
@@ -59,7 +59,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310
index cd3328374a8..215df494adc 100644
--- a/sys/arch/evbarm/conf/IQ80310
+++ b/sys/arch/evbarm/conf/IQ80310
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80310,v 1.80 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: IQ80310,v 1.81 2013/06/05 23:08:00 christos Exp $
#
# IQ80310 -- Intel IQ80310 Evaluation Board Kernel
#
@@ -59,7 +59,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321
index 33ed70960e5..580a5ab3193 100644
--- a/sys/arch/evbarm/conf/IQ80321
+++ b/sys/arch/evbarm/conf/IQ80321
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80321,v 1.77 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: IQ80321,v 1.78 2013/06/05 23:08:00 christos Exp $
#
# IQ80321 -- Intel IQ80321 Evaluation Board Kernel
#
@@ -59,7 +59,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/IXDP425 b/sys/arch/evbarm/conf/IXDP425
index 2f6ebb619b2..5b9eaf3e51e 100644
--- a/sys/arch/evbarm/conf/IXDP425
+++ b/sys/arch/evbarm/conf/IXDP425
@@ -1,4 +1,4 @@
-# $NetBSD: IXDP425,v 1.42 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: IXDP425,v 1.43 2013/06/05 23:08:00 christos Exp $
#
# IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
#
@@ -63,7 +63,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/IXM1200 b/sys/arch/evbarm/conf/IXM1200
index 7a5c706a61f..a800020fd6f 100644
--- a/sys/arch/evbarm/conf/IXM1200
+++ b/sys/arch/evbarm/conf/IXM1200
@@ -1,4 +1,4 @@
-# $NetBSD: IXM1200,v 1.53 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: IXM1200,v 1.54 2013/06/05 23:08:00 christos Exp $
#
# IXM1200 -- Intel IXM1200 Evaluation Board Kernel
#
@@ -58,7 +58,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/LUBBOCK b/sys/arch/evbarm/conf/LUBBOCK
index 9759b7bc95d..b9d4e91d3d5 100644
--- a/sys/arch/evbarm/conf/LUBBOCK
+++ b/sys/arch/evbarm/conf/LUBBOCK
@@ -57,7 +57,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/MARVELL_NAS b/sys/arch/evbarm/conf/MARVELL_NAS
index f17ab660a22..4edea9a9c5e 100644
--- a/sys/arch/evbarm/conf/MARVELL_NAS
+++ b/sys/arch/evbarm/conf/MARVELL_NAS
@@ -1,4 +1,4 @@
-# $NetBSD: MARVELL_NAS,v 1.15 2013/05/15 12:20:04 reinoud Exp $
+# $NetBSD: MARVELL_NAS,v 1.16 2013/06/05 23:08:00 christos Exp $
#
# This configuration supports for generically Marvell NAS.
@@ -70,7 +70,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/MINI2440 b/sys/arch/evbarm/conf/MINI2440
index a52bcbe60c1..c7815ff4c45 100644
--- a/sys/arch/evbarm/conf/MINI2440
+++ b/sys/arch/evbarm/conf/MINI2440
@@ -1,4 +1,4 @@
-# $NetBSD: MINI2440,v 1.10 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: MINI2440,v 1.11 2013/06/05 23:08:00 christos Exp $
#
# MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
#
@@ -84,7 +84,6 @@ options WAPBL # File system journaling support - Experimental
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/MMNET_GENERIC b/sys/arch/evbarm/conf/MMNET_GENERIC
index 944fd8e6433..696ddffef64 100644
--- a/sys/arch/evbarm/conf/MMNET_GENERIC
+++ b/sys/arch/evbarm/conf/MMNET_GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.14 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: MMNET_GENERIC,v 1.15 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.14 $"
+#ident "GENERIC-$Revision: 1.15 $"
maxusers 32 # estimated number of users
@@ -161,7 +161,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/MPCSA_GENERIC b/sys/arch/evbarm/conf/MPCSA_GENERIC
index fe0a563587f..b4b0f3a1cf7 100644
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.37 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.38 2013/06/05 23:08:00 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.37 $"
+#ident "GENERIC-$Revision: 1.38 $"
maxusers 32 # estimated number of users
@@ -158,7 +158,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/MV2120 b/sys/arch/evbarm/conf/MV2120
index 297bc3a5fd5..1b673b717ee 100644
--- a/sys/arch/evbarm/conf/MV2120
+++ b/sys/arch/evbarm/conf/MV2120
@@ -1,4 +1,4 @@
-# $NetBSD: MV2120,v 1.16 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: MV2120,v 1.17 2013/06/05 23:08:00 christos Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@@ -77,7 +77,6 @@ options UDP_CSUM_COUNTERS
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/N900 b/sys/arch/evbarm/conf/N900
index c5e08d4d249..c6b033c7984 100644
--- a/sys/arch/evbarm/conf/N900
+++ b/sys/arch/evbarm/conf/N900
@@ -1,5 +1,5 @@
#
-# $NetBSD: N900,v 1.13 2013/05/06 22:56:55 khorben Exp $
+# $NetBSD: N900,v 1.14 2013/06/05 23:08:00 christos Exp $
#
# N900 -- Nokia N900 Kernel
#
@@ -58,13 +58,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/NAPPI b/sys/arch/evbarm/conf/NAPPI
index 5a9271c0889..21a9944fa48 100644
--- a/sys/arch/evbarm/conf/NAPPI
+++ b/sys/arch/evbarm/conf/NAPPI
@@ -1,4 +1,4 @@
-# $NetBSD: NAPPI,v 1.49 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: NAPPI,v 1.50 2013/06/05 23:08:00 christos Exp $
#
# NAPPI -- Netwise APlication Platform Board Kernel
#
@@ -58,7 +58,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/NETWALKER b/sys/arch/evbarm/conf/NETWALKER
index d0cc6c82720..3da11620fb3 100644
--- a/sys/arch/evbarm/conf/NETWALKER
+++ b/sys/arch/evbarm/conf/NETWALKER
@@ -1,4 +1,4 @@
-# $NetBSD: NETWALKER,v 1.19 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: NETWALKER,v 1.20 2013/06/05 23:08:00 christos Exp $
#
# NETWALKER -- http://www.sharp.co.jp/netwalker/
#
@@ -59,7 +59,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/OSK5912 b/sys/arch/evbarm/conf/OSK5912
index 548f7c71d7a..12cdfc5e055 100644
--- a/sys/arch/evbarm/conf/OSK5912
+++ b/sys/arch/evbarm/conf/OSK5912
@@ -52,13 +52,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/OVERO b/sys/arch/evbarm/conf/OVERO
index 1cb58fcb5e5..6ccfcadf1f2 100644
--- a/sys/arch/evbarm/conf/OVERO
+++ b/sys/arch/evbarm/conf/OVERO
@@ -1,5 +1,5 @@
#
-# $NetBSD: OVERO,v 1.28 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: OVERO,v 1.29 2013/06/05 23:08:00 christos Exp $
#
# OVERO -- Gumstix. Inc. Overo COMS platforms kernel
#
@@ -74,13 +74,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/PANDABOARD b/sys/arch/evbarm/conf/PANDABOARD
index 0431437e300..000ba07a258 100644
--- a/sys/arch/evbarm/conf/PANDABOARD
+++ b/sys/arch/evbarm/conf/PANDABOARD
@@ -1,5 +1,5 @@
#
-# $NetBSD: PANDABOARD,v 1.7 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: PANDABOARD,v 1.8 2013/06/05 23:08:00 christos Exp $
#
# PANDABOARD -- TI OMAP 4430 Eval Board Kernel
#
@@ -57,13 +57,9 @@ options WAPBL # File system journaling support - Experimental
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/RPI b/sys/arch/evbarm/conf/RPI
index 2e3876bddfd..4a9814360fd 100644
--- a/sys/arch/evbarm/conf/RPI
+++ b/sys/arch/evbarm/conf/RPI
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.33 2013/05/15 12:16:41 reinoud Exp $
+# $NetBSD: RPI,v 1.34 2013/06/05 23:08:00 christos Exp $
#
# RPi -- Raspberry Pi
#
@@ -61,13 +61,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/SHEEVAPLUG b/sys/arch/evbarm/conf/SHEEVAPLUG
index 2caf48ca299..73d52b3a9e1 100644
--- a/sys/arch/evbarm/conf/SHEEVAPLUG
+++ b/sys/arch/evbarm/conf/SHEEVAPLUG
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.32 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: SHEEVAPLUG,v 1.33 2013/06/05 23:08:00 christos Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -75,7 +75,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/SMDK2410 b/sys/arch/evbarm/conf/SMDK2410
index 571a653b18b..f8b288b0bfc 100644
--- a/sys/arch/evbarm/conf/SMDK2410
+++ b/sys/arch/evbarm/conf/SMDK2410
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2410,v 1.52 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: SMDK2410,v 1.53 2013/06/05 23:08:00 christos Exp $
#
# SMDK2410 -- Samsung's S3C2410 evaluation board.
#
@@ -70,7 +70,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/SMDK2800 b/sys/arch/evbarm/conf/SMDK2800
index 3f6c1520cfe..c26c0ef29e3 100644
--- a/sys/arch/evbarm/conf/SMDK2800
+++ b/sys/arch/evbarm/conf/SMDK2800
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2800,v 1.51 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: SMDK2800,v 1.52 2013/06/05 23:08:00 christos Exp $
#
# SMDK2800 -- Samsung's S3C2800 evaluation board.
#
@@ -66,7 +66,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/TEAMASA_NPWR b/sys/arch/evbarm/conf/TEAMASA_NPWR
index 17334203c74..779e8c29bd4 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR,v 1.79 2013/04/27 21:43:22 christos Exp $
+# $NetBSD: TEAMASA_NPWR,v 1.80 2013/06/05 23:08:00 christos Exp $
#
# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
# server appliance.
@@ -62,7 +62,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
index b8ca3327a40..3183aac8359 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR_FC,v 1.41 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: TEAMASA_NPWR_FC,v 1.42 2013/06/05 23:08:00 christos Exp $
#
# TeamASA NPWR-FC, i80321-based SBC
#
@@ -60,7 +60,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbarm/conf/TISDP2420 b/sys/arch/evbarm/conf/TISDP2420
index eb7de126f19..34c500b58cc 100644
--- a/sys/arch/evbarm/conf/TISDP2420
+++ b/sys/arch/evbarm/conf/TISDP2420
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2420,v 1.24 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: TISDP2420,v 1.25 2013/06/05 23:08:00 christos Exp $
#
# TISDP2420 -- TI OMAP 2420 Eval Board Kernel
#
@@ -57,13 +57,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/TISDP2430 b/sys/arch/evbarm/conf/TISDP2430
index e089581be0a..fbbcfc6a477 100644
--- a/sys/arch/evbarm/conf/TISDP2430
+++ b/sys/arch/evbarm/conf/TISDP2430
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2430,v 1.25 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: TISDP2430,v 1.26 2013/06/05 23:08:00 christos Exp $
#
# TISDP2430 -- TI OMAP 2430 Eval Board Kernel
#
@@ -56,13 +56,9 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
diff --git a/sys/arch/evbarm/conf/TS7200 b/sys/arch/evbarm/conf/TS7200
index 7821034280e..9bd05e42365 100644
--- a/sys/arch/evbarm/conf/TS7200
+++ b/sys/arch/evbarm/conf/TS7200
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.55 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: TS7200,v 1.56 2013/06/05 23:08:00 christos Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -65,7 +65,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options NETATALK # AppleTalk networking
diff --git a/sys/arch/evbarm/conf/TWINTAIL b/sys/arch/evbarm/conf/TWINTAIL
index 7e68790f583..efffd69b723 100644
--- a/sys/arch/evbarm/conf/TWINTAIL
+++ b/sys/arch/evbarm/conf/TWINTAIL
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.56 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: TWINTAIL,v 1.57 2013/06/05 23:08:01 christos Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -63,7 +63,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options NETATALK # AppleTalk networking
diff --git a/sys/arch/evbarm/conf/VIPER b/sys/arch/evbarm/conf/VIPER
index 69f96887960..e66821d1c2c 100644
--- a/sys/arch/evbarm/conf/VIPER
+++ b/sys/arch/evbarm/conf/VIPER
@@ -1,4 +1,4 @@
-# $NetBSD: VIPER,v 1.30 2013/03/02 02:42:11 christos Exp $
+# $NetBSD: VIPER,v 1.31 2013/06/05 23:08:01 christos Exp $
#
# Arcom Viper
#
@@ -55,7 +55,6 @@ options NFSSERVER
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options NETATALK # AppleTalk networking
diff --git a/sys/arch/evbarm/conf/ZAO425 b/sys/arch/evbarm/conf/ZAO425
index 49506ee2a04..eaf15b63e18 100644
--- a/sys/arch/evbarm/conf/ZAO425
+++ b/sys/arch/evbarm/conf/ZAO425
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425,v 1.50 2013/03/02 02:42:12 christos Exp $
+# $NetBSD: ZAO425,v 1.51 2013/06/05 23:08:01 christos Exp $
#
# ZAO425 -- Intel IXP425
#
@@ -63,7 +63,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbmips/conf/ADM5120 b/sys/arch/evbmips/conf/ADM5120
index 13b85ce09f8..f7c7329fa63 100644
--- a/sys/arch/evbmips/conf/ADM5120
+++ b/sys/arch/evbmips/conf/ADM5120
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120,v 1.15 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: ADM5120,v 1.16 2013/06/05 23:08:01 christos Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.15 $"
+#ident "GENERIC-$Revision: 1.16 $"
maxusers 32
@@ -86,9 +86,6 @@ options INET # Internet protocols
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
-#options NS # Xerox NS networking
-#options NSIP # Xerox NS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk (over Ethernet) protocol
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbmips/conf/ADM5120-NB b/sys/arch/evbmips/conf/ADM5120-NB
index 52e42901616..c6d614e74ad 100644
--- a/sys/arch/evbmips/conf/ADM5120-NB
+++ b/sys/arch/evbmips/conf/ADM5120-NB
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120-NB,v 1.14 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: ADM5120-NB,v 1.15 2013/06/05 23:08:01 christos Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.14 $"
+#ident "GENERIC-$Revision: 1.15 $"
maxusers 32
@@ -110,9 +110,6 @@ options NETGRAPH_VLAN
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
-#options NS # Xerox NS networking
-#options NSIP # Xerox NS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk (over Ethernet) protocol
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbmips/conf/ADM5120-USB b/sys/arch/evbmips/conf/ADM5120-USB
index 5e0986cefb4..a2cd7d1d053 100644
--- a/sys/arch/evbmips/conf/ADM5120-USB
+++ b/sys/arch/evbmips/conf/ADM5120-USB
@@ -1,11 +1,11 @@
-# $NetBSD: ADM5120-USB,v 1.14 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: ADM5120-USB,v 1.15 2013/06/05 23:08:01 christos Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.adm5120"
-#ident "GENERIC-$Revision: 1.14 $"
+#ident "GENERIC-$Revision: 1.15 $"
maxusers 32
@@ -82,9 +82,6 @@ options INET # Internet protocols
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
-#options NS # Xerox NS networking
-#options NSIP # Xerox NS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk (over Ethernet) protocol
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbmips/conf/ALCHEMY b/sys/arch/evbmips/conf/ALCHEMY
index a5deb432c2b..9c05d77f837 100644
--- a/sys/arch/evbmips/conf/ALCHEMY
+++ b/sys/arch/evbmips/conf/ALCHEMY
@@ -1,11 +1,11 @@
-# $NetBSD: ALCHEMY,v 1.50 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: ALCHEMY,v 1.51 2013/06/05 23:08:01 christos Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.alchemy"
-#ident "ALCHEMY-$Revision: 1.50 $"
+#ident "ALCHEMY-$Revision: 1.51 $"
maxusers 32
@@ -99,7 +99,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/AP30 b/sys/arch/evbmips/conf/AP30
index 572f36b6dd9..8942f6864ba 100644
--- a/sys/arch/evbmips/conf/AP30
+++ b/sys/arch/evbmips/conf/AP30
@@ -1,10 +1,10 @@
-# $NetBSD: AP30,v 1.28 2013/04/27 21:43:22 christos Exp $
+# $NetBSD: AP30,v 1.29 2013/06/05 23:08:01 christos Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "AP30-$Revision: 1.28 $"
+#ident "AP30-$Revision: 1.29 $"
maxusers 32
@@ -97,7 +97,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/CPMBR1400 b/sys/arch/evbmips/conf/CPMBR1400
index 6d3dd368f94..b6508218a84 100644
--- a/sys/arch/evbmips/conf/CPMBR1400
+++ b/sys/arch/evbmips/conf/CPMBR1400
@@ -111,7 +111,6 @@ options INET # IP + ICMP + TCP + UDP
options MROUTING # IP multicast routing
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options PIM # Protocol Independent Multicast
#options NETATALK # AppleTalk networking protocols
diff --git a/sys/arch/evbmips/conf/DB120 b/sys/arch/evbmips/conf/DB120
index 8f644144703..1e8618bb8b8 100644
--- a/sys/arch/evbmips/conf/DB120
+++ b/sys/arch/evbmips/conf/DB120
@@ -1,4 +1,4 @@
-# $NetBSD: DB120,v 1.10 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: DB120,v 1.11 2013/06/05 23:08:01 christos Exp $
#
# Qualcomm Atheros AR9344 DB120 evaluation board.
#
@@ -7,7 +7,7 @@ include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "DB120-$Revision: 1.10 $"
+#ident "DB120-$Revision: 1.11 $"
maxusers 32
@@ -104,7 +104,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/GDIUM b/sys/arch/evbmips/conf/GDIUM
index 3aec4b77c02..a7a5d8b9e2a 100644
--- a/sys/arch/evbmips/conf/GDIUM
+++ b/sys/arch/evbmips/conf/GDIUM
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM,v 1.21 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: GDIUM,v 1.22 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.gdium"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GDIUM-$Revision: 1.21 $"
+#ident "GDIUM-$Revision: 1.22 $"
maxusers 16
@@ -94,7 +94,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/LOONGSON b/sys/arch/evbmips/conf/LOONGSON
index 82d048ecfe7..916fa301fa4 100644
--- a/sys/arch/evbmips/conf/LOONGSON
+++ b/sys/arch/evbmips/conf/LOONGSON
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.19 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: LOONGSON,v 1.20 2013/06/05 23:08:01 christos Exp $
#
# LOONGSON machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.loongson"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "LOONGSON-$Revision: 1.19 $"
+#ident "LOONGSON-$Revision: 1.20 $"
maxusers 16
@@ -102,7 +102,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA
index d0c17ab2a15..371136bdb7a 100644
--- a/sys/arch/evbmips/conf/MALTA
+++ b/sys/arch/evbmips/conf/MALTA
@@ -1,10 +1,10 @@
-# $NetBSD: MALTA,v 1.74 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: MALTA,v 1.75 2013/06/05 23:08:01 christos Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.74 $"
+#ident "MALTA-$Revision: 1.75 $"
maxusers 32
@@ -92,7 +92,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/MERAKI b/sys/arch/evbmips/conf/MERAKI
index e4f7062f537..e9548480c4c 100644
--- a/sys/arch/evbmips/conf/MERAKI
+++ b/sys/arch/evbmips/conf/MERAKI
@@ -1,10 +1,10 @@
-# $NetBSD: MERAKI,v 1.22 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: MERAKI,v 1.23 2013/06/05 23:08:01 christos Exp $
include "arch/evbmips/conf/std.meraki"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MERAKI-$Revision: 1.22 $"
+#ident "MERAKI-$Revision: 1.23 $"
maxusers 32
@@ -96,13 +96,9 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
-#options NS # Xerox NS networking
-#options NSIP # Xerox NS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk (over Ethernet) protocol
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbmips/conf/RB153 b/sys/arch/evbmips/conf/RB153
index 8d8ced11494..308f24904f5 100644
--- a/sys/arch/evbmips/conf/RB153
+++ b/sys/arch/evbmips/conf/RB153
@@ -1,10 +1,10 @@
-# $NetBSD: RB153,v 1.12 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: RB153,v 1.13 2013/06/05 23:08:01 christos Exp $
#
# Example kernel config for the RouterBOARD 153.
include "arch/evbmips/conf/std.adm5120"
-#ident "RB153-$Revision: 1.12 $"
+#ident "RB153-$Revision: 1.13 $"
maxusers 32
@@ -71,9 +71,6 @@ options INET6 # IPV6
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
-#options NS # Xerox NS networking
-#options NSIP # Xerox NS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk (over Ethernet) protocol
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbmips/conf/RB433UAH b/sys/arch/evbmips/conf/RB433UAH
index 97ad75617a6..b7bedcaeb98 100644
--- a/sys/arch/evbmips/conf/RB433UAH
+++ b/sys/arch/evbmips/conf/RB433UAH
@@ -1,10 +1,10 @@
-# $NetBSD: RB433UAH,v 1.7 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: RB433UAH,v 1.8 2013/06/05 23:08:01 christos Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "RB433UAH-$Revision: 1.7 $"
+#ident "RB433UAH-$Revision: 1.8 $"
maxusers 32
@@ -97,7 +97,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/WGT624V3 b/sys/arch/evbmips/conf/WGT624V3
index f90e8d1ecc8..c86ee30a594 100644
--- a/sys/arch/evbmips/conf/WGT624V3
+++ b/sys/arch/evbmips/conf/WGT624V3
@@ -1,10 +1,10 @@
-# $NetBSD: WGT624V3,v 1.19 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: WGT624V3,v 1.20 2013/06/05 23:08:01 christos Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "WGT624V3-$Revision: 1.19 $"
+#ident "WGT624V3-$Revision: 1.20 $"
maxusers 32
@@ -98,7 +98,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbmips/conf/XLSATX b/sys/arch/evbmips/conf/XLSATX
index 54ae0f71aec..47d29598033 100644
--- a/sys/arch/evbmips/conf/XLSATX
+++ b/sys/arch/evbmips/conf/XLSATX
@@ -1,8 +1,8 @@
-# $NetBSD: XLSATX,v 1.16 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: XLSATX,v 1.17 2013/06/05 23:08:01 christos Exp $
include "arch/evbmips/conf/std.rmixl"
-#ident "XLSATX-$Revision: 1.16 $"
+#ident "XLSATX-$Revision: 1.17 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -97,7 +97,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/evbppc/conf/EV64260 b/sys/arch/evbppc/conf/EV64260
index 26ec71d7b97..ea20639a318 100644
--- a/sys/arch/evbppc/conf/EV64260
+++ b/sys/arch/evbppc/conf/EV64260
@@ -1,4 +1,4 @@
-# $NetBSD: EV64260,v 1.57 2013/04/27 21:43:23 christos Exp $
+# $NetBSD: EV64260,v 1.58 2013/06/05 23:08:01 christos Exp $
#
# MVP -- Motorola's Multiprocessing Verification Platform
#
@@ -116,7 +116,6 @@ options NFS_BOOT_RWSIZE=1024
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/EXPLORA451 b/sys/arch/evbppc/conf/EXPLORA451
index d7d861de80c..859160d9092 100644
--- a/sys/arch/evbppc/conf/EXPLORA451
+++ b/sys/arch/evbppc/conf/EXPLORA451
@@ -1,4 +1,4 @@
-# $NetBSD: EXPLORA451,v 1.52 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: EXPLORA451,v 1.53 2013/06/05 23:08:01 christos Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -109,7 +109,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/MPC8536DS b/sys/arch/evbppc/conf/MPC8536DS
index b53a721a159..fefe4b40503 100644
--- a/sys/arch/evbppc/conf/MPC8536DS
+++ b/sys/arch/evbppc/conf/MPC8536DS
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8536DS,v 1.17 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: MPC8536DS,v 1.18 2013/06/05 23:08:01 christos Exp $
#
# MPC8536DS -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8536DS-$Revision: 1.17 $"
+ident "MPC8536DS-$Revision: 1.18 $"
maxusers 32
@@ -106,7 +106,6 @@ options TCP_CSUM_COUNTERS
options UDP_CSUM_COUNTERS
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/MPC8548CDS b/sys/arch/evbppc/conf/MPC8548CDS
index c2de0621ca6..5e6ddfc7b49 100644
--- a/sys/arch/evbppc/conf/MPC8548CDS
+++ b/sys/arch/evbppc/conf/MPC8548CDS
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8548CDS,v 1.16 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: MPC8548CDS,v 1.17 2013/06/05 23:08:01 christos Exp $
#
# MPC8548CDS -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8548CDS-$Revision: 1.16 $"
+ident "MPC8548CDS-$Revision: 1.17 $"
maxusers 32
@@ -108,7 +108,6 @@ options TCP_CSUM_COUNTERS
options UDP_CSUM_COUNTERS
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/OPENBLOCKS200 b/sys/arch/evbppc/conf/OPENBLOCKS200
index a69aa03696e..56ba2228eab 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS200
+++ b/sys/arch/evbppc/conf/OPENBLOCKS200
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS200,v 1.38 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: OPENBLOCKS200,v 1.39 2013/06/05 23:08:01 christos Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -97,7 +97,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/OPENBLOCKS600 b/sys/arch/evbppc/conf/OPENBLOCKS600
index 1f6216b80e1..cc3f94c1eaa 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS600
+++ b/sys/arch/evbppc/conf/OPENBLOCKS600
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS600,v 1.13 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: OPENBLOCKS600,v 1.14 2013/06/05 23:08:01 christos Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.obs600"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OPENBLOCKS600-$Revision: 1.13 $"
+#ident "OPENBLOCKS600-$Revision: 1.14 $"
maxusers 32
@@ -116,7 +116,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/P2020DS b/sys/arch/evbppc/conf/P2020DS
index beb33858ddf..ae8c19cab27 100644
--- a/sys/arch/evbppc/conf/P2020DS
+++ b/sys/arch/evbppc/conf/P2020DS
@@ -1,4 +1,4 @@
-# $NetBSD: P2020DS,v 1.18 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: P2020DS,v 1.19 2013/06/05 23:08:01 christos Exp $
#
# P2020DS -- everything that's currently supported
#
@@ -8,7 +8,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "P2020DS-$Revision: 1.18 $"
+ident "P2020DS-$Revision: 1.19 $"
maxusers 32
@@ -112,7 +112,6 @@ options TCP_CSUM_COUNTERS
options UDP_CSUM_COUNTERS
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/P2020RDB b/sys/arch/evbppc/conf/P2020RDB
index 10f83fd52ea..cc48f1c523c 100644
--- a/sys/arch/evbppc/conf/P2020RDB
+++ b/sys/arch/evbppc/conf/P2020RDB
@@ -1,4 +1,4 @@
-# $NetBSD: P2020RDB,v 1.19 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: P2020RDB,v 1.20 2013/06/05 23:08:01 christos Exp $
#
# P2020RBD -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "P2020RBD-$Revision: 1.19 $"
+ident "P2020RBD-$Revision: 1.20 $"
maxusers 32
@@ -108,7 +108,6 @@ options TCP_CSUM_COUNTERS
options UDP_CSUM_COUNTERS
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/PMPPC b/sys/arch/evbppc/conf/PMPPC
index b634a94bcc0..c4be1b8b73d 100644
--- a/sys/arch/evbppc/conf/PMPPC
+++ b/sys/arch/evbppc/conf/PMPPC
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.28 2013/04/27 18:19:34 christos Exp $
+# $NetBSD: PMPPC,v 1.29 2013/06/05 23:08:01 christos Exp $
#
# PMPPC
#
@@ -95,7 +95,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/RB800 b/sys/arch/evbppc/conf/RB800
index 627cbdb5409..9e32ad5929b 100644
--- a/sys/arch/evbppc/conf/RB800
+++ b/sys/arch/evbppc/conf/RB800
@@ -1,4 +1,4 @@
-# $NetBSD: RB800,v 1.24 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: RB800,v 1.25 2013/06/05 23:08:01 christos Exp $
#
# RB800 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "RB800-$Revision: 1.24 $"
+ident "RB800-$Revision: 1.25 $"
maxusers 32
@@ -110,7 +110,6 @@ options TCP_CSUM_COUNTERS
options UDP_CSUM_COUNTERS
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/TWRP1025 b/sys/arch/evbppc/conf/TWRP1025
index 1cc6810c06f..cfff0a0350f 100644
--- a/sys/arch/evbppc/conf/TWRP1025
+++ b/sys/arch/evbppc/conf/TWRP1025
@@ -1,4 +1,4 @@
-# $NetBSD: TWRP1025,v 1.10 2013/03/02 02:42:13 christos Exp $
+# $NetBSD: TWRP1025,v 1.11 2013/06/05 23:08:01 christos Exp $
#
# TWRP1025 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "TWRP1025-$Revision: 1.10 $"
+ident "TWRP1025-$Revision: 1.11 $"
maxusers 32
@@ -106,7 +106,6 @@ options TCP_CSUM_COUNTERS
options UDP_CSUM_COUNTERS
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/evbppc/conf/VIRTEX_DFC b/sys/arch/evbppc/conf/VIRTEX_DFC
index 9a3fde9d536..a29608038f8 100644
--- a/sys/arch/evbppc/conf/VIRTEX_DFC
+++ b/sys/arch/evbppc/conf/VIRTEX_DFC
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_DFC,v 1.21 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: VIRTEX_DFC,v 1.22 2013/06/05 23:08:01 christos Exp $
#
# VIRTEX_DFC
#
@@ -110,14 +110,10 @@ options NFS_BOOT_DHCP # Support DHCP NFS root
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
#options DIRECTED_BROADCAST # allow broadcasts through routers
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking protocols
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbppc/conf/VIRTEX_GSRD1 b/sys/arch/evbppc/conf/VIRTEX_GSRD1
index af6f3560acb..6589bddab7c 100644
--- a/sys/arch/evbppc/conf/VIRTEX_GSRD1
+++ b/sys/arch/evbppc/conf/VIRTEX_GSRD1
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_GSRD1,v 1.19 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: VIRTEX_GSRD1,v 1.20 2013/06/05 23:08:01 christos Exp $
#
# VIRTEX_GSRD1
#
@@ -104,14 +104,10 @@ options NFS_BOOT_DHCP # Support DHCP NFS root
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
#options DIRECTED_BROADCAST # allow broadcasts through routers
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking protocols
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbppc/conf/VIRTEX_GSRD2 b/sys/arch/evbppc/conf/VIRTEX_GSRD2
index 0e944a37c2e..5bb4f392eb7 100644
--- a/sys/arch/evbppc/conf/VIRTEX_GSRD2
+++ b/sys/arch/evbppc/conf/VIRTEX_GSRD2
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_GSRD2,v 1.20 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: VIRTEX_GSRD2,v 1.21 2013/06/05 23:08:01 christos Exp $
#
# VIRTEX_GSRD2
#
@@ -112,14 +112,10 @@ options NFS_BOOT_DHCP # Support DHCP NFS root
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
#options DIRECTED_BROADCAST # allow broadcasts through routers
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
-#options CCITT,LLC,HDLC # X.25
#options NETATALK # AppleTalk networking protocols
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/evbppc/conf/WALNUT b/sys/arch/evbppc/conf/WALNUT
index 621576a72fb..1a8e784aad6 100644
--- a/sys/arch/evbppc/conf/WALNUT
+++ b/sys/arch/evbppc/conf/WALNUT
@@ -1,4 +1,4 @@
-# $NetBSD: WALNUT,v 1.64 2013/04/27 21:43:24 christos Exp $
+# $NetBSD: WALNUT,v 1.65 2013/06/05 23:08:01 christos Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -98,7 +98,6 @@ options NFS_BOOT_DHCP # Support DHCP NFS root
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/ews4800mips/conf/GENERIC b/sys/arch/ews4800mips/conf/GENERIC
index a9447069017..a470f454486 100644
--- a/sys/arch/ews4800mips/conf/GENERIC
+++ b/sys/arch/ews4800mips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.43 2013/04/27 21:43:25 christos Exp $
+# $NetBSD: GENERIC,v 1.44 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
# This machine description file is used to generate the default NetBSD
@@ -25,7 +25,7 @@ include "arch/ews4800mips/conf/std.ews4800mips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.43 $"
+#ident "GENERIC-$Revision: 1.44 $"
maxusers 16
@@ -129,7 +129,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 661c9060ac5..e0ce1af4550 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.177 2013/04/27 21:43:25 christos Exp $
+# $NetBSD: GENERIC,v 1.178 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.177 $"
+#ident "GENERIC-$Revision: 1.178 $"
maxusers 32 # estimated number of users
@@ -133,7 +133,6 @@ options NFS_BOOT_BOOTP # use bootp for NFS boot
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options GATEWAY # IP forwarding
options MROUTING # Multicast routing
diff --git a/sys/arch/hp300/conf/INSTALL b/sys/arch/hp300/conf/INSTALL
index 20fabc6b961..3369626b548 100644
--- a/sys/arch/hp300/conf/INSTALL
+++ b/sys/arch/hp300/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.53 2013/04/27 21:43:25 christos Exp $
+# $NetBSD: INSTALL,v 1.54 2013/06/05 23:08:01 christos Exp $
#
# INSTALL machine description file
#
@@ -93,7 +93,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP forwarding
#options MROUTING # Multicast routing
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index ef2a89098fe..d99bc876197 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: GENERIC,v 1.123 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.122 $"
+#ident "GENERIC-$Revision: 1.123 $"
maxusers 32 # estimated number of users
@@ -125,7 +125,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index 231c963a78a..0e0caa31a38 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-# $NetBSD: IPAQ,v 1.73 2013/04/27 21:43:26 christos Exp $
+# $NetBSD: IPAQ,v 1.74 2013/06/05 23:08:01 christos Exp $
#
# iPAQ H3600 -- Windows-CE based PDA
#
@@ -57,7 +57,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720
index 8cee82bf775..8de6f2262c6 100644
--- a/sys/arch/hpcarm/conf/JORNADA720
+++ b/sys/arch/hpcarm/conf/JORNADA720
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA720,v 1.92 2013/04/27 21:43:26 christos Exp $
+# $NetBSD: JORNADA720,v 1.93 2013/06/05 23:08:01 christos Exp $
#
# JORNADA -- Windows-CE based jornada 720
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.92 $"
+#ident "GENERIC-$Revision: 1.93 $"
# estimated number of users
maxusers 32
@@ -60,7 +60,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
options IPSEC # IP security
-#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 --git a/sys/arch/hpcarm/conf/JORNADA820 b/sys/arch/hpcarm/conf/JORNADA820
index c2fc9883808..23ce532eaac 100644
--- a/sys/arch/hpcarm/conf/JORNADA820
+++ b/sys/arch/hpcarm/conf/JORNADA820
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA820,v 1.32 2013/04/27 21:43:26 christos Exp $
+# $NetBSD: JORNADA820,v 1.33 2013/06/05 23:08:01 christos Exp $
#
# JORNADA -- Windows-CE based jornada 820
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.32 $"
+#ident "GENERIC-$Revision: 1.33 $"
# estimated number of users
maxusers 32
@@ -58,7 +58,6 @@ options WAPBL # File system journaling support
#options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/hpcarm/conf/NETBOOKPRO b/sys/arch/hpcarm/conf/NETBOOKPRO
index dfde266431f..cf97e11a939 100644
--- a/sys/arch/hpcarm/conf/NETBOOKPRO
+++ b/sys/arch/hpcarm/conf/NETBOOKPRO
@@ -1,4 +1,4 @@
-# $NetBSD: NETBOOKPRO,v 1.11 2013/04/27 21:43:27 christos Exp $
+# $NetBSD: NETBOOKPRO,v 1.12 2013/06/05 23:08:01 christos Exp $
#
# NETBOOKPRO -- Psion Teklogix NETBOOK PRO
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.netbookpro"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
# estimated number of users
maxusers 32
@@ -69,7 +69,6 @@ options FFS_EI # FFS Endian Independant support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/hpcarm/conf/WZERO3 b/sys/arch/hpcarm/conf/WZERO3
index a5513863394..94e52c3ec11 100644
--- a/sys/arch/hpcarm/conf/WZERO3
+++ b/sys/arch/hpcarm/conf/WZERO3
@@ -1,4 +1,4 @@
-# $NetBSD: WZERO3,v 1.32 2013/04/27 21:43:27 christos Exp $
+# $NetBSD: WZERO3,v 1.33 2013/06/05 23:08:01 christos Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.32 $"
+#ident "GENERIC-$Revision: 1.33 $"
# estimated number of users
maxusers 32
@@ -69,7 +69,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/hpcmips/conf/GENERIC b/sys/arch/hpcmips/conf/GENERIC
index fa95ac9e20d..d58cd82c722 100644
--- a/sys/arch/hpcmips/conf/GENERIC
+++ b/sys/arch/hpcmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.221 2013/04/27 21:43:27 christos Exp $
+# $NetBSD: GENERIC,v 1.222 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.tx39"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.221 $"
+#ident "GENERIC-$Revision: 1.222 $"
maxusers 16
@@ -102,7 +102,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/hpcmips/conf/LROUTER b/sys/arch/hpcmips/conf/LROUTER
index c8b399cb129..ee70f127977 100644
--- a/sys/arch/hpcmips/conf/LROUTER
+++ b/sys/arch/hpcmips/conf/LROUTER
@@ -1,5 +1,5 @@
#
-# $NetBSD: LROUTER,v 1.50 2013/04/27 21:43:27 christos Exp $
+# $NetBSD: LROUTER,v 1.51 2013/06/05 23:08:01 christos Exp $
# From: NetBSD: MPC303,v 1.4 2001/11/21 11:28:09 uch Exp
#
# Kernel configuration file for LASER5 L-Router
@@ -84,7 +84,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/hpcmips/conf/MPC303 b/sys/arch/hpcmips/conf/MPC303
index 66a0a5f6dfc..f01dbb7fd57 100644
--- a/sys/arch/hpcmips/conf/MPC303
+++ b/sys/arch/hpcmips/conf/MPC303
@@ -1,5 +1,5 @@
#
-# $NetBSD: MPC303,v 1.64 2013/04/27 21:43:27 christos Exp $
+# $NetBSD: MPC303,v 1.65 2013/06/05 23:08:01 christos Exp $
# From: NetBSD: GENERIC,v 1.91 2001/05/06 14:25:16 takemura Exp
#
# Kernel configuration file for Victor MP-C303; enami's test machine.
@@ -9,7 +9,7 @@ include "arch/hpcmips/conf/std.hpcmips"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.64 $"
+#ident "GENERIC-$Revision: 1.65 $"
maxusers 16
@@ -82,7 +82,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/hpcmips/conf/TX3912 b/sys/arch/hpcmips/conf/TX3912
index 3bcd0077d32..75fc07756d0 100644
--- a/sys/arch/hpcmips/conf/TX3912
+++ b/sys/arch/hpcmips/conf/TX3912
@@ -2,7 +2,7 @@
# Distribution kernel (TOSHIBA TX3912 based model) kernel config file
#
-# $NetBSD: TX3912,v 1.83 2013/04/27 21:43:28 christos Exp $
+# $NetBSD: TX3912,v 1.84 2013/06/05 23:08:01 christos Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -85,7 +85,6 @@ file-system PTYFS # /dev/pts/N support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/hpcmips/conf/TX3922 b/sys/arch/hpcmips/conf/TX3922
index c5d2e0f13ce..77e72ee41d5 100644
--- a/sys/arch/hpcmips/conf/TX3922
+++ b/sys/arch/hpcmips/conf/TX3922
@@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
-# $NetBSD: TX3922,v 1.97 2013/04/27 21:43:28 christos Exp $
+# $NetBSD: TX3922,v 1.98 2013/06/05 23:08:01 christos Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -74,7 +74,6 @@ file-system PTYFS # /dev/pts/N support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/hpcmips/conf/VR41XX b/sys/arch/hpcmips/conf/VR41XX
index a52fb7d5338..b75bfe5f0c5 100644
--- a/sys/arch/hpcmips/conf/VR41XX
+++ b/sys/arch/hpcmips/conf/VR41XX
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.59 2013/04/27 21:43:28 christos Exp $
+# $NetBSD: VR41XX,v 1.60 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/hpcmips/conf/std.hpcmips"
include "arch/hpcmips/conf/std.hpcmips.vr41"
-#ident "GENERIC-$Revision: 1.59 $"
+#ident "GENERIC-$Revision: 1.60 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -95,7 +95,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # Multicast routing support
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 85a07be8e75..522083c7d64 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.357 2013/05/28 12:13:55 kiyohara Exp $
+# $NetBSD: ALL,v 1.358 2013/06/05 23:08:01 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.357 $"
+#ident "ALL-$Revision: 1.358 $"
maxusers 64 # estimated number of users
@@ -211,7 +211,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
-options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options MPLS # MultiProtocol Label Switching (needs ifmpls)
options MROUTING # IP multicast routing
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 50c3f9b6bfb..e775f5e4539 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1093 2013/05/28 12:13:55 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.1094 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1093 $"
+#ident "GENERIC-$Revision: 1.1094 $"
maxusers 64 # estimated number of users
@@ -200,7 +200,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MPLS # MultiProtocol Label Switching (needs ifmpls)
#options MROUTING # IP multicast routing
diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY
index 890f8022dda..aa7e349777c 100644
--- a/sys/arch/i386/conf/GENERIC_PS2TINY
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.68 2013/03/02 02:42:15 christos Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.69 2013/06/05 23:08:01 christos 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,
@@ -98,7 +98,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501
index f646c3b6f01..a12c8c8f0fb 100644
--- a/sys/arch/i386/conf/NET4501
+++ b/sys/arch/i386/conf/NET4501
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.80 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: NET4501,v 1.81 2013/06/05 23:08:01 christos Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.80 $"
+#ident "NET4501-$Revision: 1.81 $"
maxusers 32 # estimated number of users
@@ -133,7 +133,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/i386/conf/XEN3_DOM0 b/sys/arch/i386/conf/XEN3_DOM0
index f405138cedd..8f42eeb565a 100644
--- a/sys/arch/i386/conf/XEN3_DOM0
+++ b/sys/arch/i386/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77 2013/04/27 22:21:14 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.78 2013/06/05 23:08:01 christos Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -145,7 +145,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/i386/conf/XEN3_DOMU b/sys/arch/i386/conf/XEN3_DOMU
index 9802cd6cc5c..2bbc9d40198 100644
--- a/sys/arch/i386/conf/XEN3_DOMU
+++ b/sys/arch/i386/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.53 2013/04/27 21:43:30 christos Exp $
+# $NetBSD: XEN3_DOMU,v 1.54 2013/06/05 23:08:01 christos Exp $
include "arch/xen/conf/std.xen"
@@ -134,7 +134,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/iyonix/conf/GENERIC b/sys/arch/iyonix/conf/GENERIC
index 938523faec4..73173dbe777 100644
--- a/sys/arch/iyonix/conf/GENERIC
+++ b/sys/arch/iyonix/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.78 2013/04/27 22:21:15 christos Exp $
+# $NetBSD: GENERIC,v 1.79 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.78 $"
+#ident "GENERIC-$Revision: 1.79 $"
maxusers 32 # estimated number of users
@@ -155,7 +155,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/luna68k/conf/GENERIC b/sys/arch/luna68k/conf/GENERIC
index b631ffe0254..49fe0d9972a 100644
--- a/sys/arch/luna68k/conf/GENERIC
+++ b/sys/arch/luna68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.106 2013/05/10 16:30:50 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.107 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.106 $"
+#ident "GENERIC-$Revision: 1.107 $"
maxusers 8
@@ -104,7 +104,6 @@ options WAPBL # File system journaling support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # IP multicast routing
diff --git a/sys/arch/luna68k/conf/INSTALL b/sys/arch/luna68k/conf/INSTALL
index ee773a6d1e4..7901503ba92 100644
--- a/sys/arch/luna68k/conf/INSTALL
+++ b/sys/arch/luna68k/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.12 2013/04/27 21:43:31 christos Exp $
+# $NetBSD: INSTALL,v 1.13 2013/06/05 23:08:01 christos Exp $
#
# config for installation ramdisk kernel
#
@@ -90,7 +90,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # IP multicast routing
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 36b85147572..f778335f3c2 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.212 2013/04/27 21:43:31 christos Exp $
+# $NetBSD: GENERIC,v 1.213 2013/06/05 23:08:01 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.212 $"
+#ident "GENERIC-$Revision: 1.213 $"
maxusers 16 # estimated number of users
@@ -135,7 +135,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/mipsco/conf/RC3230 b/sys/arch/mipsco/conf/RC3230
index 0739d70cb33..1547b03af87 100644
--- a/sys/arch/mipsco/conf/RC3230
+++ b/sys/arch/mipsco/conf/RC3230
@@ -1,5 +1,5 @@
#
-# $NetBSD: RC3230,v 1.44 2013/04/27 21:43:33 christos Exp $
+# $NetBSD: RC3230,v 1.45 2013/06/05 23:08:01 christos Exp $
#
include "arch/mipsco/conf/std.mipsco"
@@ -74,7 +74,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
options INET6 # Internet protocols
options IPSEC # Internet protocols
-options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options GATEWAY # IP packet forwarding
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC
index 478981e33b1..53735ff318d 100644
--- a/sys/arch/mmeye/conf/GENERIC
+++ b/sys/arch/mmeye/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.114 2013/04/27 21:43:33 christos Exp $
+# $NetBSD: GENERIC,v 1.115 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.114 $"
+#ident "GENERIC-$Revision: 1.115 $"
maxusers 16 # estimated number of users
@@ -117,7 +117,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/mmeye/conf/MMEYE_WLF b/sys/arch/mmeye/conf/MMEYE_WLF
index 4c1b6eda1ba..e06ee083c25 100644
--- a/sys/arch/mmeye/conf/MMEYE_WLF
+++ b/sys/arch/mmeye/conf/MMEYE_WLF
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.11 2013/04/27 21:43:33 christos Exp $
+# $NetBSD: MMEYE_WLF,v 1.12 2013/06/05 23:08:02 christos Exp $
#
# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
maxusers 16 # estimated number of users
@@ -118,7 +118,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index bf54d866a9f..1452d9c980f 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.88 2013/04/27 21:43:33 christos Exp $
+# $NetBSD: GENERIC,v 1.89 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mvme68k/conf/std.mvme68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.88 $"
+#ident "GENERIC-$Revision: 1.89 $"
# Boards this kernel supports
options MVME147
@@ -77,7 +77,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC
index af252f3bda0..35002c278f4 100644
--- a/sys/arch/mvmeppc/conf/GENERIC
+++ b/sys/arch/mvmeppc/conf/GENERIC
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.20 2013/04/27 22:21:15 christos Exp $
+# $NetBSD: GENERIC,v 1.21 2013/06/05 23:08:02 christos Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.20 $"
+ident "GENERIC-$Revision: 1.21 $"
maxusers 8
@@ -71,7 +71,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index 8d3e594a9db..e16bc6dc23e 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 2013/04/27 21:43:34 christos Exp $
+# $NetBSD: GENERIC,v 1.119 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -82,7 +82,6 @@ options WAPBL # File system journaling support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/news68k/conf/GENERIC b/sys/arch/news68k/conf/GENERIC
index 4313032b7da..be54c00051a 100644
--- a/sys/arch/news68k/conf/GENERIC
+++ b/sys/arch/news68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115 2013/04/27 21:43:36 christos Exp $
+# $NetBSD: GENERIC,v 1.116 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.115 $"
+#ident "GENERIC-$Revision: 1.116 $"
maxusers 8
@@ -113,7 +113,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # IP multicast routing
diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY
index b4b58785480..fdd2b6cc7fb 100644
--- a/sys/arch/news68k/conf/GENERIC_TINY
+++ b/sys/arch/news68k/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.76 2013/04/27 21:43:37 christos Exp $
+# $NetBSD: GENERIC_TINY,v 1.77 2013/06/05 23:08:02 christos Exp $
# news68k GENERIC config file for low memory machines;
#
@@ -6,7 +6,7 @@ include "arch/news68k/conf/std.news68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC_TINY-$Revision: 1.76 $"
+#ident "GENERIC_TINY-$Revision: 1.77 $"
maxusers 4
@@ -91,7 +91,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # IP multicast routing
diff --git a/sys/arch/news68k/conf/LIBERO b/sys/arch/news68k/conf/LIBERO
index e008fd6fadb..aab275e398a 100644
--- a/sys/arch/news68k/conf/LIBERO
+++ b/sys/arch/news68k/conf/LIBERO
@@ -1,4 +1,4 @@
-# $NetBSD: LIBERO,v 1.59 2013/04/27 21:43:37 christos Exp $
+# $NetBSD: LIBERO,v 1.60 2013/06/05 23:08:02 christos Exp $
# NEWS1750 config file;
#
@@ -80,7 +80,6 @@ options FFS_NO_SNAPSHOT # FFS snapshot support
options INET # Internet protocols
options INET6 # IPv6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options PFIL_HOOKS # pfil(9) packet filter hooks
diff --git a/sys/arch/news68k/conf/NEWS1200 b/sys/arch/news68k/conf/NEWS1200
index 694ca5ab670..8ac5a526be7 100644
--- a/sys/arch/news68k/conf/NEWS1200
+++ b/sys/arch/news68k/conf/NEWS1200
@@ -1,4 +1,4 @@
-# $NetBSD: NEWS1200,v 1.57 2013/04/27 21:43:37 christos Exp $
+# $NetBSD: NEWS1200,v 1.58 2013/06/05 23:08:02 christos Exp $
# news1200 config file
#
@@ -82,7 +82,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # IP multicast routing
diff --git a/sys/arch/newsmips/conf/GENERIC b/sys/arch/newsmips/conf/GENERIC
index 9e6d6da5c83..332e1d60145 100644
--- a/sys/arch/newsmips/conf/GENERIC
+++ b/sys/arch/newsmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2013/04/27 21:43:37 christos Exp $
+# $NetBSD: GENERIC,v 1.123 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.122 $"
+#ident "GENERIC-$Revision: 1.123 $"
maxusers 16
@@ -103,7 +103,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options MROUTING # packet forwarding of multicast packets
diff --git a/sys/arch/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC
index 25240786e68..04f77f790e9 100644
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.132 2013/04/27 21:43:38 christos Exp $
+# $NetBSD: GENERIC,v 1.133 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.132 $"
+#ident "GENERIC-$Revision: 1.133 $"
# Needs to be set per system. i.e change these as you see fit
maxusers 16
@@ -129,7 +129,6 @@ options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/next68k/conf/SLAB b/sys/arch/next68k/conf/SLAB
index c3bfbe19a64..b50184a7b65 100644
--- a/sys/arch/next68k/conf/SLAB
+++ b/sys/arch/next68k/conf/SLAB
@@ -1,4 +1,4 @@
-# $NetBSD: SLAB,v 1.50 2013/04/27 21:43:38 christos Exp $
+# $NetBSD: SLAB,v 1.51 2013/06/05 23:08:02 christos Exp $
#
# deberg's development machine
#
@@ -95,7 +95,6 @@ file-system PTYFS # /dev/pts/N support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC
index 3af4c78c040..561ee4a2dde 100644
--- a/sys/arch/ofppc/conf/GENERIC
+++ b/sys/arch/ofppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.149 2013/04/27 21:43:38 christos Exp $
+# $NetBSD: GENERIC,v 1.150 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.149 $"
+#ident "GENERIC-$Revision: 1.150 $"
maxusers 32
@@ -126,7 +126,6 @@ options NFS_BOOT_DHCP # Support DHCP NFS root
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index e6637681e7e..59475fc690f 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.178 2013/04/27 21:43:38 christos Exp $
+# $NetBSD: GENERIC,v 1.179 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.178 $"
+#ident "GENERIC-$Revision: 1.179 $"
maxusers 64
@@ -106,7 +106,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options GATEWAY # IP packet forwarding
#options MROUTING # Multicast routing support
diff --git a/sys/arch/pmax/conf/GENERIC64 b/sys/arch/pmax/conf/GENERIC64
index e43ce06c157..debec566b28 100644
--- a/sys/arch/pmax/conf/GENERIC64
+++ b/sys/arch/pmax/conf/GENERIC64
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.15 2013/04/27 21:43:38 christos Exp $
+# $NetBSD: GENERIC64,v 1.16 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.15 $"
+#ident "GENERIC-$Revision: 1.16 $"
maxusers 64
@@ -99,7 +99,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options GATEWAY # IP packet forwarding
#options MROUTING # Multicast routing support
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index 20ed39aed00..0e568d72e57 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2013/04/27 22:21:15 christos Exp $
+# $NetBSD: GENERIC,v 1.169 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.168 $"
+#ident "GENERIC-$Revision: 1.169 $"
maxusers 32
@@ -111,7 +111,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/rs6000/conf/GENERIC b/sys/arch/rs6000/conf/GENERIC
index a34b7d4381a..8dbb82bbc48 100644
--- a/sys/arch/rs6000/conf/GENERIC
+++ b/sys/arch/rs6000/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.26 2013/04/27 22:21:15 christos Exp $
+# $NetBSD: GENERIC,v 1.27 2013/06/05 23:08:02 christos Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.26 $"
+#ident "GENERIC-$Revision: 1.27 $"
maxusers 32
@@ -117,7 +117,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
#options IPSEC # IP security
-#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 --git a/sys/arch/sandpoint/conf/GENERIC b/sys/arch/sandpoint/conf/GENERIC
index 6185f186a59..3d78ad776ab 100644
--- a/sys/arch/sandpoint/conf/GENERIC
+++ b/sys/arch/sandpoint/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.78 2013/04/27 21:43:39 christos Exp $
+# $NetBSD: GENERIC,v 1.79 2013/06/05 23:08:02 christos Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpoint"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.78 $"
+#ident "GENERIC-$Revision: 1.79 $"
maxusers 32
@@ -127,7 +127,6 @@ options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/sbmips/conf/GENERIC b/sys/arch/sbmips/conf/GENERIC
index 4ff025d50ea..7550db681e0 100644
--- a/sys/arch/sbmips/conf/GENERIC
+++ b/sys/arch/sbmips/conf/GENERIC
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.93 2013/04/27 22:21:15 christos Exp $
+# $NetBSD: GENERIC,v 1.94 2013/06/05 23:08:02 christos Exp $
include "arch/sbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.93 $"
+#ident "GENERIC-$Revision: 1.94 $"
#options LOCKDEBUG # XXX XXX XXX XXX
#options DEBUG # extra kernel debugging support
@@ -88,7 +88,6 @@ options WAPBL # File system journaling support
options INET # Internet protocols
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # packet forwarding of multicast packets
#options PIM # Protocol Independent Multicast
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP12 b/sys/arch/sgimips/conf/GENERIC32_IP12
index 1e0dfd34dc9..41d97b6843e 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP12
+++ b/sys/arch/sgimips/conf/GENERIC32_IP12
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.21 2013/04/27 22:21:16 christos Exp $
+# $NetBSD: GENERIC32_IP12,v 1.22 2013/06/05 23:08:03 christos Exp $
#
# GENERIC32_IP12 machine description file
#
@@ -32,7 +32,7 @@ makeoptions TEXTADDR=0x80002000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.21 $"
+#ident "GENERIC32-IP2x-$Revision: 1.22 $"
maxusers 32
@@ -127,7 +127,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x
index 386aa29db1a..61804d9b382 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.97 2013/04/27 22:21:16 christos Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.98 2013/06/05 23:08:03 christos Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.97 $"
+#ident "GENERIC32-IP2x-$Revision: 1.98 $"
maxusers 32
@@ -128,7 +128,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index e35462f06f3..24548715407 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.99 2013/04/27 22:21:16 christos Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.100 2013/06/05 23:08:03 christos Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.99 $"
+#ident "GENERIC32_IP3x-$Revision: 1.100 $"
maxusers 32
@@ -121,7 +121,6 @@ options NFSSERVER # Network File System server
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC
index 3584a3ab266..32ac37dc27c 100644
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.109 2013/04/27 22:21:16 christos Exp $
+# $NetBSD: GENERIC,v 1.110 2013/06/05 23:08:03 christos Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.109 $"
+#ident "GENERIC-$Revision: 1.110 $"
# estimated number of users
maxusers 32
@@ -72,7 +72,6 @@ options NFSSERVER
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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 --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 9befda140aa..f47b8b14ab8 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.240 2013/04/27 21:43:40 christos Exp $
+# $NetBSD: GENERIC,v 1.241 2013/06/05 23:08:03 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.240 $"
+#ident "GENERIC-$Revision: 1.241 $"
maxusers 32
@@ -218,7 +218,6 @@ options WAPBL # File system journaling support
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#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
diff --git a/sys/arch/sparc/conf/KRUPS b/sys/arch/sparc/conf/KRUPS
index 1e6babf7849..b32a3ba9c50 100644
--- a/sys/arch/sparc/conf/KRUPS
+++ b/sys/arch/sparc/conf/KRUPS
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.63 2013/04/27 21:43:41 christos Exp $
+# $NetBSD: KRUPS,v 1.64 2013/06/05 23:08:03 christos Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.63 $"
+#ident "KRUPS-$Revision: 1.64 $"
maxusers 32
@@ -215,7 +215,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#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
diff --git a/sys/arch/sparc/conf/MRCOFFEE b/sys/arch/sparc/conf/MRCOFFEE
index 1115921df7f..fd7034a9c51 100644
--- a/sys/arch/sparc/conf/MRCOFFEE
+++ b/sys/arch/sparc/conf/MRCOFFEE
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.42 2013/04/27 21:43:41 christos Exp $
+# $NetBSD: MRCOFFEE,v 1.43 2013/06/05 23:08:03 christos Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.42 $"
+#ident "MRCOFFEE-$Revision: 1.43 $"
maxusers 32
@@ -199,7 +199,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#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
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 6f878b3721d..ceab8fc9377 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.166 2013/06/05 21:45:06 jnemeth Exp $
+# $NetBSD: GENERIC,v 1.167 2013/06/05 23:08:03 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.166 $"
+#ident "GENERIC-$Revision: 1.167 $"
maxusers 64
@@ -192,7 +192,6 @@ options WAPBL # File system journaling support
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#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
diff --git a/sys/arch/sparc64/conf/NONPLUS64 b/sys/arch/sparc64/conf/NONPLUS64
index 5c893cda863..f724081d453 100644
--- a/sys/arch/sparc64/conf/NONPLUS64
+++ b/sys/arch/sparc64/conf/NONPLUS64
@@ -1,8 +1,8 @@
-# $NetBSD: NONPLUS64,v 1.38 2013/04/27 18:19:52 christos Exp $
+# $NetBSD: NONPLUS64,v 1.39 2013/06/05 23:08:03 christos Exp $
include "arch/sparc64/conf/std.sparc64"
-#ident "NONPLUS64-$Revision: 1.38 $"
+#ident "NONPLUS64-$Revision: 1.39 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -157,7 +157,6 @@ options QUOTA2 # new, in-filesystem UFS quotas
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions
options GATEWAY # packet forwarding ("router switch")
diff --git a/sys/arch/sun2/conf/FOURMEG b/sys/arch/sun2/conf/FOURMEG
index db14e568fe2..3bc76f298ff 100644
--- a/sys/arch/sun2/conf/FOURMEG
+++ b/sys/arch/sun2/conf/FOURMEG
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.53 2013/04/27 21:43:41 christos Exp $
+# $NetBSD: FOURMEG,v 1.54 2013/06/05 23:08:03 christos Exp $
# FOURMEG Sun2 (2/120, 2/170, 2/50, ...)
# Supports root on: ie0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "FOURMEG-$Revision: 1.53 $"
+#ident "FOURMEG-$Revision: 1.54 $"
makeoptions COPTS="-Os" # optimize for size
@@ -79,7 +79,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/sun2/conf/GENERIC b/sys/arch/sun2/conf/GENERIC
index 2fb38dc902b..78856a3348b 100644
--- a/sys/arch/sun2/conf/GENERIC
+++ b/sys/arch/sun2/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.87 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: GENERIC,v 1.88 2013/06/05 23:08:03 christos Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun2/conf/std.sun2"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.87 $"
+#ident "GENERIC-$Revision: 1.88 $"
makeoptions COPTS="-Os" # optimize for size
@@ -109,7 +109,6 @@ options INET # IP protocol stack support
#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 packet forwarding
options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/sun2/conf/INSTALL b/sys/arch/sun2/conf/INSTALL
index 9409650b7f8..d0f2a7dcb41 100644
--- a/sys/arch/sun2/conf/INSTALL
+++ b/sys/arch/sun2/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.46 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: INSTALL,v 1.47 2013/06/05 23:08:03 christos Exp $
# INSTALL Sun2 (2/120, 2/170, 2/50, ...)
@@ -6,7 +6,7 @@ include "arch/sun2/conf/std.sun2"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.46 $"
+#ident "INSTALL-$Revision: 1.47 $"
makeoptions COPTS="-Os" # optimize for size
@@ -74,7 +74,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/sun2/conf/RAMDISK b/sys/arch/sun2/conf/RAMDISK
index ee64c4dff0f..73d669cc1bf 100644
--- a/sys/arch/sun2/conf/RAMDISK
+++ b/sys/arch/sun2/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.53 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: RAMDISK,v 1.54 2013/06/05 23:08:03 christos Exp $
# RAMDISK: Root/swap on ramdisk
# This kernel is used to:
@@ -79,7 +79,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
#options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/sun2/conf/VME b/sys/arch/sun2/conf/VME
index b236559404e..cb5c28250a8 100644
--- a/sys/arch/sun2/conf/VME
+++ b/sys/arch/sun2/conf/VME
@@ -1,4 +1,4 @@
-# $NetBSD: VME,v 1.44 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: VME,v 1.45 2013/06/05 23:08:03 christos Exp $
# VME Sun2 (2/50, 2/130, 2/160...)
# Supports root on: ie0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "VME-$Revision: 1.44 $"
+#ident "VME-$Revision: 1.45 $"
# Machines to be supported by this kernel
#options FPU_EMULATE
@@ -81,7 +81,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
#options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 1d819817aff..ee503640f83 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.164 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: GENERIC,v 1.165 2013/06/05 23:08:03 christos Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.164 $"
+#ident "GENERIC-$Revision: 1.165 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -119,7 +119,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index c7917a7a461..af484e3f558 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.120 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: GENERIC3X,v 1.121 2013/06/05 23:08:03 christos Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun3/conf/std.sun3x"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC3X-$Revision: 1.120 $"
+#ident "GENERIC3X-$Revision: 1.121 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -102,7 +102,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP protocol stack support
options INET6 # IPV6
#options IPSEC # IP security
-#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
options PFIL_HOOKS # pfil(9) packet filter hooks.
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index dd596257916..0da682313c9 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.187 2013/04/27 21:43:42 christos Exp $
+# $NetBSD: GENERIC,v 1.188 2013/06/05 23:08:03 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.187 $"
+#ident "GENERIC-$Revision: 1.188 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -66,12 +66,8 @@ options NTP # NTP kernel support
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
#options NETATALK # AppleTalk networking protocols
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/vax/conf/VAX780 b/sys/arch/vax/conf/VAX780
index f4f9ac15085..aafd8470282 100644
--- a/sys/arch/vax/conf/VAX780
+++ b/sys/arch/vax/conf/VAX780
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.14 2013/04/27 21:43:43 christos Exp $
+# $NetBSD: VAX780,v 1.15 2013/06/05 23:08:03 christos Exp $
#
# 11/780,750,730 machine description file
#
@@ -51,12 +51,9 @@ options KTRACE
options INET # IP + ICMP + TCP + UDP
#options INET6 # IPV6
#options IPSEC # IP security
-#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
-#options NS # XNS
-#options NSIP # XNS tunneling over IP
#options NETATALK # AppleTalk networking protocols
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index 0799659f5e6..cb46fd8d8ca 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2013/04/27 21:43:43 christos Exp $
+# $NetBSD: GENERIC,v 1.169 2013/06/05 23:08:03 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.168 $"
+#ident "GENERIC-$Revision: 1.169 $"
maxusers 8
@@ -201,7 +201,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#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
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index 42386f916f1..5206051294c 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.100 2013/05/26 12:18:06 isaki Exp $
+# $NetBSD: INSTALL,v 1.101 2013/06/05 23:08:03 christos Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.100 $"
+#ident "INSTALL-$Revision: 1.101 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -184,7 +184,6 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support
options INET # IP (Internet Protocol) v4
options INET6 # IPV6
#options IPSEC # IP security
-#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