Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Under FAST_IPSEC, IPSEC_ESP is mandatory; GC it.
details: https://anonhg.NetBSD.org/src/rev/62a6b2766652
branches: trunk
changeset: 785185:62a6b2766652
user: christos <christos%NetBSD.org@localhost>
date: Sat Mar 02 02:42:07 2013 +0000
description:
Under FAST_IPSEC, IPSEC_ESP is mandatory; GC it.
diffstat:
sys/arch/acorn26/conf/FOURMEG | 3 +--
sys/arch/acorn26/conf/GENERIC | 3 +--
sys/arch/acorn26/conf/INSTALL | 3 +--
sys/arch/acorn32/conf/EB7500ATX | 5 ++---
sys/arch/acorn32/conf/GENERIC | 5 ++---
sys/arch/acorn32/conf/INSTALL | 5 ++---
sys/arch/acorn32/conf/LOWMEM_WSCONS | 3 +--
sys/arch/acorn32/conf/NC | 3 +--
sys/arch/algor/conf/P4032 | 5 ++---
sys/arch/algor/conf/P5064 | 5 ++---
sys/arch/algor/conf/P6032 | 5 ++---
sys/arch/alpha/conf/GENERIC | 5 ++---
sys/arch/amd64/conf/GENERIC | 5 ++---
sys/arch/amd64/conf/XEN3_DOM0 | 3 +--
sys/arch/amd64/conf/XEN3_DOMU | 3 +--
sys/arch/amiga/conf/DRACO | 5 ++---
sys/arch/amiga/conf/GENERIC | 5 ++---
sys/arch/amiga/conf/GENERIC.in | 5 ++---
sys/arch/amiga/conf/INSTALL | 5 ++---
sys/arch/amigappc/conf/GENERIC | 5 ++---
sys/arch/amigappc/conf/NULL | 5 ++---
sys/arch/arc/conf/ARCTIC | 3 +--
sys/arch/arc/conf/GENERIC | 5 ++---
sys/arch/arc/conf/M403 | 3 +--
sys/arch/arc/conf/MIMORI | 3 +--
sys/arch/arc/conf/PICA | 3 +--
sys/arch/arc/conf/RPC44 | 5 ++---
sys/arch/atari/conf/GENERIC.in | 3 +--
sys/arch/bebox/conf/GENERIC | 5 ++---
sys/arch/cats/conf/GENERIC | 3 +--
sys/arch/cats/conf/INSTALL | 3 +--
sys/arch/cobalt/conf/GENERIC | 5 ++---
sys/arch/cobalt/conf/INSTALL | 5 ++---
sys/arch/dreamcast/conf/GENERIC | 3 +--
sys/arch/emips/conf/GENERIC | 5 ++---
sys/arch/evbarm/conf/ADI_BRH | 3 +--
sys/arch/evbarm/conf/ARMADILLO210 | 3 +--
sys/arch/evbarm/conf/ARMADILLO9 | 3 +--
sys/arch/evbarm/conf/BCM5301X | 3 +--
sys/arch/evbarm/conf/BEAGLEBOARD | 3 +--
sys/arch/evbarm/conf/BEAGLEBOARDXM | 3 +--
sys/arch/evbarm/conf/BEAGLEBONE | 3 +--
sys/arch/evbarm/conf/CP3100 | 3 +--
sys/arch/evbarm/conf/GEMINI | 1 -
sys/arch/evbarm/conf/GEMINI_MASTER | 1 -
sys/arch/evbarm/conf/GEMINI_SLAVE | 1 -
sys/arch/evbarm/conf/GOLDENGATE | 3 +--
sys/arch/evbarm/conf/GUMSTIX | 3 +--
sys/arch/evbarm/conf/HDL_G | 3 +--
sys/arch/evbarm/conf/HPT5325 | 3 +--
sys/arch/evbarm/conf/IGEPV2 | 3 +--
sys/arch/evbarm/conf/IMX31LITE | 3 +--
sys/arch/evbarm/conf/INTEGRATOR | 3 +--
sys/arch/evbarm/conf/INTEGRATOR_CP | 3 +--
sys/arch/evbarm/conf/IQ31244 | 3 +--
sys/arch/evbarm/conf/IQ80310 | 3 +--
sys/arch/evbarm/conf/IQ80321 | 3 +--
sys/arch/evbarm/conf/IXDP425 | 3 +--
sys/arch/evbarm/conf/IXM1200 | 3 +--
sys/arch/evbarm/conf/LUBBOCK | 1 -
sys/arch/evbarm/conf/MARVELL_NAS | 3 +--
sys/arch/evbarm/conf/MINI2440 | 3 +--
sys/arch/evbarm/conf/MMNET_GENERIC | 5 ++---
sys/arch/evbarm/conf/MPCSA_GENERIC | 5 ++---
sys/arch/evbarm/conf/MV2120 | 3 +--
sys/arch/evbarm/conf/N900 | 3 +--
sys/arch/evbarm/conf/NAPPI | 3 +--
sys/arch/evbarm/conf/NETWALKER | 3 +--
sys/arch/evbarm/conf/NSLU2 | 3 +--
sys/arch/evbarm/conf/OPENBLOCKS_A6 | 3 +--
sys/arch/evbarm/conf/OSK5912 | 1 -
sys/arch/evbarm/conf/OVERO | 3 +--
sys/arch/evbarm/conf/PANDABOARD | 3 +--
sys/arch/evbarm/conf/RPI | 3 +--
sys/arch/evbarm/conf/SHEEVAPLUG | 3 +--
sys/arch/evbarm/conf/SMDK2410 | 3 +--
sys/arch/evbarm/conf/SMDK2800 | 3 +--
sys/arch/evbarm/conf/TEAMASA_NPWR | 3 +--
sys/arch/evbarm/conf/TEAMASA_NPWR_FC | 3 +--
sys/arch/evbarm/conf/TISDP2420 | 3 +--
sys/arch/evbarm/conf/TISDP2430 | 3 +--
sys/arch/evbarm/conf/TS7200 | 3 +--
sys/arch/evbarm/conf/TWINTAIL | 3 +--
sys/arch/evbarm/conf/VIPER | 3 +--
sys/arch/evbarm/conf/ZAO425 | 3 +--
sys/arch/evbmips/conf/ADM5120 | 5 ++---
sys/arch/evbmips/conf/ADM5120-NB | 5 ++---
sys/arch/evbmips/conf/ADM5120-USB | 5 ++---
sys/arch/evbmips/conf/ALCHEMY | 5 ++---
sys/arch/evbmips/conf/AP30 | 5 ++---
sys/arch/evbmips/conf/CPMBR1400 | 1 -
sys/arch/evbmips/conf/DB120 | 5 ++---
sys/arch/evbmips/conf/GDIUM | 5 ++---
sys/arch/evbmips/conf/LOONGSON | 5 ++---
sys/arch/evbmips/conf/MALTA | 5 ++---
sys/arch/evbmips/conf/MERAKI | 5 ++---
sys/arch/evbmips/conf/RB153 | 5 ++---
sys/arch/evbmips/conf/RB433UAH | 5 ++---
sys/arch/evbmips/conf/WGT624V3 | 5 ++---
sys/arch/evbmips/conf/XLSATX | 5 ++---
sys/arch/evbppc/conf/EV64260 | 3 +--
sys/arch/evbppc/conf/EXPLORA451 | 3 +--
sys/arch/evbppc/conf/MPC8536DS | 5 ++---
sys/arch/evbppc/conf/MPC8548CDS | 5 ++---
sys/arch/evbppc/conf/OPENBLOCKS200 | 3 +--
sys/arch/evbppc/conf/OPENBLOCKS266 | 5 ++---
sys/arch/evbppc/conf/OPENBLOCKS600 | 5 ++---
sys/arch/evbppc/conf/P2020DS | 5 ++---
sys/arch/evbppc/conf/P2020RDB | 5 ++---
sys/arch/evbppc/conf/PMPPC | 3 +--
sys/arch/evbppc/conf/RB800 | 5 ++---
sys/arch/evbppc/conf/TWRP1025 | 5 ++---
sys/arch/evbppc/conf/VIRTEX_DFC | 3 +--
sys/arch/evbppc/conf/VIRTEX_GSRD1 | 3 +--
sys/arch/evbppc/conf/VIRTEX_GSRD2 | 3 +--
sys/arch/evbppc/conf/WALNUT | 3 +--
sys/arch/ews4800mips/conf/GENERIC | 5 ++---
sys/arch/hp300/conf/GENERIC | 5 ++---
sys/arch/hp300/conf/INSTALL | 3 +--
sys/arch/hp700/conf/GENERIC | 5 ++---
sys/arch/hpcarm/conf/IPAQ | 3 +--
sys/arch/hpcarm/conf/JORNADA720 | 5 ++---
sys/arch/hpcarm/conf/JORNADA820 | 5 ++---
sys/arch/hpcarm/conf/NETBOOKPRO | 5 ++---
sys/arch/hpcarm/conf/WZERO3 | 5 ++---
sys/arch/hpcmips/conf/GENERIC | 5 ++---
sys/arch/hpcmips/conf/LROUTER | 3 +--
sys/arch/hpcmips/conf/MPC303 | 5 ++---
sys/arch/hpcmips/conf/TX3912 | 3 +--
sys/arch/hpcmips/conf/TX3922 | 3 +--
sys/arch/hpcmips/conf/VR41XX | 5 ++---
sys/arch/i386/conf/ALL | 5 ++---
sys/arch/i386/conf/GENERIC | 5 ++---
sys/arch/i386/conf/GENERIC_PS2TINY | 3 +--
sys/arch/i386/conf/NET4501 | 5 ++---
sys/arch/i386/conf/XEN3_DOM0 | 3 +--
sys/arch/i386/conf/XEN3_DOMU | 3 +--
sys/arch/iyonix/conf/GENERIC | 5 ++---
sys/arch/landisk/conf/GENERIC | 5 ++---
sys/arch/luna68k/conf/GENERIC | 5 ++---
sys/arch/luna68k/conf/INSTALL | 3 +--
sys/arch/mac68k/conf/GENERIC | 5 ++---
sys/arch/macppc/conf/GENERIC | 5 ++---
sys/arch/mipsco/conf/RC3230 | 3 +--
sys/arch/mmeye/conf/GENERIC | 5 ++---
sys/arch/mmeye/conf/MMEYE_WLF | 5 ++---
sys/arch/mvme68k/conf/GENERIC | 5 ++---
sys/arch/mvmeppc/conf/GENERIC | 5 ++---
sys/arch/netwinder/conf/GENERIC | 3 +--
sys/arch/news68k/conf/GENERIC | 5 ++---
sys/arch/news68k/conf/GENERIC_TINY | 5 ++---
sys/arch/news68k/conf/LIBERO | 3 +--
sys/arch/news68k/conf/NEWS1200 | 3 +--
sys/arch/newsmips/conf/GENERIC | 5 ++---
sys/arch/next68k/conf/GENERIC | 5 ++---
sys/arch/next68k/conf/SLAB | 3 +--
sys/arch/ofppc/conf/GENERIC | 5 ++---
sys/arch/pmax/conf/GENERIC | 5 ++---
sys/arch/pmax/conf/GENERIC64 | 5 ++---
sys/arch/prep/conf/GENERIC | 5 ++---
sys/arch/rs6000/conf/GENERIC | 5 ++---
sys/arch/sandpoint/conf/GENERIC | 5 ++---
sys/arch/sbmips/conf/GENERIC | 5 ++---
sys/arch/sgimips/conf/GENERIC32_IP12 | 5 ++---
sys/arch/sgimips/conf/GENERIC32_IP2x | 5 ++---
sys/arch/sgimips/conf/GENERIC32_IP3x | 5 ++---
sys/arch/shark/conf/GENERIC | 5 ++---
sys/arch/sparc/conf/GENERIC | 5 ++---
sys/arch/sparc/conf/KRUPS | 5 ++---
sys/arch/sparc/conf/MRCOFFEE | 5 ++---
sys/arch/sparc64/conf/GENERIC | 5 ++---
sys/arch/sparc64/conf/NONPLUS64 | 5 ++---
sys/arch/sun2/conf/DISKLESS | 5 ++---
sys/arch/sun2/conf/FOURMEG | 5 ++---
sys/arch/sun2/conf/INSTALL | 5 ++---
sys/arch/sun2/conf/RAMDISK | 3 +--
sys/arch/sun2/conf/VME | 5 ++---
sys/arch/sun3/conf/GENERIC | 5 ++---
sys/arch/sun3/conf/GENERIC3X | 5 ++---
sys/arch/vax/conf/GENERIC | 5 ++---
sys/arch/vax/conf/VAX780 | 3 +--
sys/arch/x68k/conf/GENERIC | 5 ++---
sys/arch/x68k/conf/INSTALL | 5 ++---
sys/netinet/in_proto.c | 7 ++-----
184 files changed, 274 insertions(+), 460 deletions(-)
diffs (truncated from 3953 to 300 lines):
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn26/conf/FOURMEG
--- a/sys/arch/acorn26/conf/FOURMEG Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn26/conf/FOURMEG Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.41 2013/03/01 18:25:27 joerg Exp $
+# $NetBSD: FOURMEG,v 1.42 2013/03/02 02:42:07 christos Exp $
# FOURMEG arm26 configuration -- something small
@@ -64,7 +64,6 @@
options INET # Internet protocol suite
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn26/conf/GENERIC
--- a/sys/arch/acorn26/conf/GENERIC Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn26/conf/GENERIC Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.69 2013/03/01 18:25:27 joerg Exp $
+# $NetBSD: GENERIC,v 1.70 2013/03/02 02:42:07 christos Exp $
#
# GENERIC machine description file
#
@@ -82,7 +82,6 @@
options INET # Internet protocol suite
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn26/conf/INSTALL
--- a/sys/arch/acorn26/conf/INSTALL Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn26/conf/INSTALL Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.36 2013/03/01 18:25:27 joerg Exp $
+# $NetBSD: INSTALL,v 1.37 2013/03/02 02:42:07 christos Exp $
# INSTALL configuration, used to generate installation media
@@ -63,7 +63,6 @@
options INET # Internet protocol suite
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.50 2013/03/01 18:25:27 joerg Exp $
+# $NetBSD: EB7500ATX,v 1.51 2013/03/02 02:42:07 christos Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.50 $"
+#ident "EB7500ATX-$Revision: 1.51 $"
# estimated number of users
maxusers 32
@@ -72,7 +72,6 @@
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn32/conf/GENERIC Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.106 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: GENERIC,v 1.107 2013/03/02 02:42:07 christos Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.106 $"
+#ident "GENERIC-$Revision: 1.107 $"
# estimated number of users
maxusers 32
@@ -80,7 +80,6 @@
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn32/conf/INSTALL Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: INSTALL,v 1.66 2013/03/02 02:42:07 christos Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.65 $"
+#ident "INSTALL-$Revision: 1.66 $"
# estimated number of users
maxusers 32
@@ -76,7 +76,6 @@
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.60 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.61 2013/03/02 02:42:07 christos Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -60,7 +60,6 @@
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/acorn32/conf/NC Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.58 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: NC,v 1.59 2013/03/02 02:42:07 christos Exp $
#
# NC - with wscons
#
@@ -53,7 +53,6 @@
#options GATEWAY # packet forwarding
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 INET # IP + ICMP + TCP + UDP
diff -r 17a345965467 -r 62a6b2766652 sys/arch/algor/conf/P4032
--- a/sys/arch/algor/conf/P4032 Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/algor/conf/P4032 Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P4032,v 1.64 2012/08/17 20:11:37 abs Exp $
+# $NetBSD: P4032,v 1.65 2013/03/02 02:42:08 christos Exp $
#
# Algorithmics P-4032 kernel.
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P4032-$Revision: 1.64 $"
+#ident "P4032-$Revision: 1.65 $"
maxusers 32
@@ -54,7 +54,6 @@
options INET # Internet protocol suite
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/algor/conf/P5064 Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P5064,v 1.74 2012/10/13 06:06:49 riz Exp $
+# $NetBSD: P5064,v 1.75 2013/03/02 02:42:08 christos Exp $
#
# Algorithmics P-5064 kernel.
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.74 $"
+#ident "P5064-$Revision: 1.75 $"
maxusers 32
@@ -49,7 +49,6 @@
options INET # Internet protocol suite
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/algor/conf/P6032
--- a/sys/arch/algor/conf/P6032 Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/algor/conf/P6032 Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P6032,v 1.65 2012/08/17 20:11:37 abs Exp $
+# $NetBSD: P6032,v 1.66 2013/03/02 02:42:08 christos Exp $
#
# Algorithmics P-6032 kernel.
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P6032-$Revision: 1.65 $"
+#ident "P6032-$Revision: 1.66 $"
maxusers 32
@@ -49,7 +49,6 @@
options INET # Internet protocol suite
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/alpha/conf/GENERIC Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.347 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: GENERIC,v 1.348 2013/03/02 02:42:08 christos Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.347 $"
+ident "GENERIC-$Revision: 1.348 $"
maxusers 32
@@ -104,7 +104,6 @@
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
diff -r 17a345965467 -r 62a6b2766652 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/amd64/conf/GENERIC Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.367 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: GENERIC,v 1.368 2013/03/02 02:42:08 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.367 $"
+#ident "GENERIC-$Revision: 1.368 $"
maxusers 64 # estimated number of users
@@ -177,7 +177,6 @@
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 MPLS # MultiProtocol Label Switching (needs ifmpls)
diff -r 17a345965467 -r 62a6b2766652 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Fri Mar 01 18:57:59 2013 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Sat Mar 02 02:42:07 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.93 2013/03/01 18:25:28 joerg Exp $
+# $NetBSD: XEN3_DOM0,v 1.94 2013/03/02 02:42:08 christos Exp $
Home |
Main Index |
Thread Index |
Old Index