Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Unreference IPF/PF from all the config files, and e...
details: https://anonhg.NetBSD.org/src/rev/5157d2fd12bb
branches: trunk
changeset: 365130:5157d2fd12bb
user: maxv <maxv%NetBSD.org@localhost>
date: Wed Aug 01 20:04:09 2018 +0000
description:
Unreference IPF/PF from all the config files, and enable NPF instead when
wanted. This also fixes some inconsistencies I saw in several files (eg
IPF options while IPF was not compiled, IPF+PF enabled by default, etc).
diffstat:
sys/arch/acorn32/conf/EB7500ATX | 8 +++-----
sys/arch/acorn32/conf/GENERIC | 8 +++-----
sys/arch/acorn32/conf/INSTALL | 6 +++---
sys/arch/acorn32/conf/LOWMEM_WSCONS | 4 ++--
sys/arch/acorn32/conf/NC | 4 ++--
sys/arch/algor/conf/P4032 | 6 +++---
sys/arch/algor/conf/P5064 | 6 +++---
sys/arch/algor/conf/P6032 | 6 +++---
sys/arch/alpha/conf/GENERIC | 12 +++---------
sys/arch/alpha/conf/RAWHIDE | 8 ++------
sys/arch/amiga/conf/DRACO | 12 +++---------
sys/arch/amiga/conf/GENERIC | 12 +++---------
sys/arch/amiga/conf/GENERIC.in | 12 +++---------
sys/arch/amiga/conf/INSTALL | 12 +++---------
sys/arch/amigappc/conf/GENERIC | 12 +++---------
sys/arch/amigappc/conf/NULL | 11 +++--------
sys/arch/arc/conf/ARCTIC | 8 ++------
sys/arch/arc/conf/GENERIC | 12 +++---------
sys/arch/arc/conf/M403 | 6 ++----
sys/arch/arc/conf/MIMORI | 8 ++------
sys/arch/arc/conf/PICA | 8 ++------
sys/arch/arc/conf/RPC44 | 9 +++------
sys/arch/atari/conf/GENERIC.in | 11 ++---------
sys/arch/bebox/conf/GENERIC | 12 +++---------
sys/arch/cats/conf/GENERIC | 10 ++--------
sys/arch/cats/conf/INSTALL | 4 ++--
sys/arch/cesfic/conf/GENERIC | 6 ++----
sys/arch/cobalt/conf/GENERIC | 12 +++---------
sys/arch/cobalt/conf/INSTALL | 11 +++--------
sys/arch/dreamcast/conf/G1IDE | 9 ++-------
sys/arch/dreamcast/conf/GENERIC | 9 ++-------
sys/arch/emips/conf/GENERIC | 11 +++--------
sys/arch/evbarm/conf/ARMADILLO-IOT-G3 | 10 +---------
sys/arch/evbarm/conf/ARMADILLO210 | 9 ++-------
sys/arch/evbarm/conf/ARMADILLO9 | 9 ++-------
sys/arch/evbarm/conf/CP3100 | 6 ++----
sys/arch/evbarm/conf/CUBOX | 11 ++---------
sys/arch/evbarm/conf/CUBOX-I | 10 +---------
sys/arch/evbarm/conf/DUOVERO | 6 ++----
sys/arch/evbarm/conf/GUMSTIX | 10 ++--------
sys/arch/evbarm/conf/HDL_G | 10 ++--------
sys/arch/evbarm/conf/HPT5325 | 10 ++--------
sys/arch/evbarm/conf/IMX6UL-STARTER | 10 +---------
sys/arch/evbarm/conf/MARVELL_NAS | 8 +-------
sys/arch/evbarm/conf/MINI2440 | 4 ++--
sys/arch/evbarm/conf/MMNET_GENERIC | 11 +++--------
sys/arch/evbarm/conf/MPCSA_GENERIC | 12 +++---------
sys/arch/evbarm/conf/MV2120 | 10 ++--------
sys/arch/evbarm/conf/NITROGEN6X | 10 +---------
sys/arch/evbarm/conf/NSLU2 | 6 ++----
sys/arch/evbarm/conf/OPENBLOCKS_A6 | 10 ++--------
sys/arch/evbarm/conf/OPENBLOCKS_AX3 | 10 ++--------
sys/arch/evbarm/conf/OVERO | 6 ++----
sys/arch/evbarm/conf/PEPPER | 6 ++----
sys/arch/evbarm/conf/POGO | 9 ---------
sys/arch/evbarm/conf/RPI | 6 ++----
sys/arch/evbarm/conf/RPI64 | 6 ++----
sys/arch/evbarm/conf/SHEEVAPLUG | 10 ++--------
sys/arch/evbarm/conf/SMDK2410 | 4 ++--
sys/arch/evbarm/conf/SMDK2800 | 6 ++----
sys/arch/evbarm/conf/TWINTAIL | 10 ++--------
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 | 10 +++-------
sys/arch/evbmips/conf/AP30 | 8 +++-----
sys/arch/evbmips/conf/CI20 | 8 +++-----
sys/arch/evbmips/conf/CPMBR1400 | 8 ++------
sys/arch/evbmips/conf/DB120 | 8 +++-----
sys/arch/evbmips/conf/ERLITE | 6 ++----
sys/arch/evbmips/conf/GDIUM | 12 +++---------
sys/arch/evbmips/conf/LINKITSMART7688 | 11 ++---------
sys/arch/evbmips/conf/LOONGSON | 12 +++---------
sys/arch/evbmips/conf/MALTA | 10 +++-------
sys/arch/evbmips/conf/MERAKI | 7 +++----
sys/arch/evbmips/conf/RB153 | 8 +++-----
sys/arch/evbmips/conf/RB433UAH | 8 +++-----
sys/arch/evbmips/conf/SBMIPS | 12 +++---------
sys/arch/evbmips/conf/WGT624V3 | 8 +++-----
sys/arch/evbmips/conf/XLSATX | 8 +++-----
sys/arch/evbmips/conf/ZYXELKX | 8 ++------
sys/arch/evbppc/conf/EV64260 | 6 ++----
sys/arch/evbppc/conf/EXPLORA451 | 7 ++-----
sys/arch/evbppc/conf/MPC8536DS | 6 ++----
sys/arch/evbppc/conf/MPC8548CDS | 6 ++----
sys/arch/evbppc/conf/OPENBLOCKS200 | 6 ++----
sys/arch/evbppc/conf/OPENBLOCKS266 | 10 +++-------
sys/arch/evbppc/conf/OPENBLOCKS600 | 10 +++-------
sys/arch/evbppc/conf/P2020DS | 6 ++----
sys/arch/evbppc/conf/P2020RDB | 6 ++----
sys/arch/evbppc/conf/PMPPC | 8 ++------
sys/arch/evbppc/conf/RB800 | 6 ++----
sys/arch/evbppc/conf/RB850GX2 | 6 ++----
sys/arch/evbppc/conf/TWRP1025 | 6 ++----
sys/arch/evbppc/conf/VIRTEX_DFC | 8 ++------
sys/arch/evbppc/conf/VIRTEX_GSRD1 | 5 ++---
sys/arch/evbppc/conf/VIRTEX_GSRD2 | 5 ++---
sys/arch/evbppc/conf/WALNUT | 8 ++------
sys/arch/evbsh3/conf/T_SH7706LAN | 8 ++------
sys/arch/evbsh3/conf/T_SH7706LSR | 8 ++------
sys/arch/ews4800mips/conf/GENERIC | 12 +++---------
sys/arch/hp300/conf/GENERIC | 12 +++---------
sys/arch/hp300/conf/INSTALL | 4 ++--
sys/arch/hpcarm/conf/IPAQ | 4 ++--
sys/arch/hpcarm/conf/JORNADA720 | 6 +++---
sys/arch/hpcarm/conf/JORNADA820 | 6 +++---
sys/arch/hpcarm/conf/NETBOOKPRO | 6 +++---
sys/arch/hpcarm/conf/WZERO3 | 6 +++---
sys/arch/hpcmips/conf/GENERIC | 12 +++---------
sys/arch/hpcmips/conf/LROUTER | 8 ++------
sys/arch/hpcmips/conf/MPC303 | 6 +++---
sys/arch/hpcmips/conf/TX3912 | 4 ++--
sys/arch/hpcmips/conf/TX3922 | 4 ++--
sys/arch/hpcmips/conf/VR41XX | 10 +++-------
sys/arch/hpcsh/conf/GENERIC | 10 ++--------
sys/arch/hppa/conf/GENERIC | 12 +++---------
sys/arch/ia64/conf/GENERIC.SKI | 8 ++------
sys/arch/iyonix/conf/GENERIC | 11 +++--------
sys/arch/landisk/conf/GENERIC | 11 +++--------
sys/arch/luna68k/conf/GENERIC | 11 +++--------
sys/arch/luna68k/conf/INSTALL | 9 ++-------
sys/arch/mac68k/conf/GENERIC | 12 +++---------
sys/arch/macppc/conf/GENERIC | 12 +++---------
sys/arch/macppc/conf/GENERIC_601 | 12 +++---------
sys/arch/macppc/conf/MAMBO | 5 ++---
sys/arch/macppc/conf/POWERMAC | 8 ++------
sys/arch/macppc/conf/POWERMAC_G5 | 3 +--
sys/arch/macppc/conf/POWERMAC_G5_11_2 | 3 +--
sys/arch/mipsco/conf/GENERIC | 9 ++-------
sys/arch/mipsco/conf/RC3230 | 6 ++----
sys/arch/mmeye/conf/GENERIC | 12 +++---------
sys/arch/mmeye/conf/MMEYE | 4 ++--
sys/arch/mmeye/conf/MMEYE_WLF | 12 +++---------
sys/arch/mmeye/conf/MMTA | 4 ++--
sys/arch/mmeye/conf/MMTAICE | 4 ++--
sys/arch/mmeye/conf/MMTAROMNEW | 4 ++--
sys/arch/mvme68k/conf/GENERIC | 7 +++----
sys/arch/mvmeppc/conf/GENERIC | 8 +++-----
sys/arch/netwinder/conf/GENERIC | 5 ++---
sys/arch/news68k/conf/GENERIC | 12 +++---------
sys/arch/news68k/conf/GENERIC_TINY | 11 +++--------
sys/arch/news68k/conf/INSTALL | 4 +---
sys/arch/news68k/conf/LIBERO | 6 ++----
sys/arch/news68k/conf/NEWS1200 | 6 ++----
sys/arch/newsmips/conf/DEJIKO | 8 ++------
sys/arch/newsmips/conf/GENERIC | 11 +++--------
sys/arch/newsmips/conf/WAPIKO | 8 ++------
sys/arch/next68k/conf/GENERIC | 12 +++---------
sys/arch/next68k/conf/SLAB | 8 ++------
sys/arch/ofppc/conf/GENERIC | 12 +++---------
sys/arch/playstation2/conf/config.playstation2 | 4 ++--
sys/arch/pmax/conf/GENERIC | 12 +++---------
sys/arch/pmax/conf/GENERIC64 | 11 +++--------
sys/arch/prep/conf/GENERIC | 12 +++---------
sys/arch/riscv/conf/GENERIC | 8 ++------
sys/arch/rs6000/conf/GENERIC | 11 +++--------
sys/arch/sandpoint/conf/ENCPP1 | 8 +++-----
sys/arch/sandpoint/conf/GENERIC | 12 +++---------
sys/arch/sandpoint/conf/SANDPOINT | 8 +++-----
sys/arch/sbmips/conf/GENERIC | 12 +++---------
sys/arch/sgimips/conf/GENERIC32_IP12 | 11 +++--------
sys/arch/sgimips/conf/GENERIC32_IP2x | 11 +++--------
sys/arch/sgimips/conf/GENERIC32_IP3x | 11 +++--------
sys/arch/shark/conf/GENERIC | 8 +++-----
sys/arch/shark/conf/INSTALL | 4 ++--
sys/arch/shark/conf/OFWGENCFG | 4 ++--
sys/arch/sparc/conf/GENERIC | 14 +++-----------
sys/arch/sparc/conf/INSTALL | 9 ++-------
sys/arch/sparc/conf/KRUPS | 13 +++----------
sys/arch/sparc/conf/MRCOFFEE | 11 +++--------
sys/arch/sparc/conf/TADPOLE3GX | 10 ++--------
sys/arch/sparc64/conf/GENERIC | 14 +++-----------
sys/arch/sparc64/conf/NONPLUS64 | 10 +++-------
sys/arch/sun2/conf/DISKLESS | 6 +++---
sys/arch/sun2/conf/FOURMEG | 6 +++---
sys/arch/sun2/conf/GENERIC | 8 +++-----
sys/arch/sun2/conf/INSTALL | 6 +++---
sys/arch/sun2/conf/RAMDISK | 4 ++--
sys/arch/sun2/conf/VME | 6 +++---
sys/arch/sun3/conf/DISKLESS | 4 ++--
sys/arch/sun3/conf/DISKLESS3X | 4 ++--
sys/arch/sun3/conf/GENERIC | 8 +++-----
sys/arch/sun3/conf/GENERIC3X | 8 +++-----
sys/arch/sun3/conf/INSTALL | 4 ++--
sys/arch/sun3/conf/INSTALL3X | 4 ++--
sys/arch/vax/conf/GENERIC | 12 +++---------
sys/arch/vax/conf/VAX780 | 9 ++-------
sys/arch/x68k/conf/GENERIC | 13 +++----------
sys/arch/x68k/conf/INSTALL | 8 ++------
189 files changed, 455 insertions(+), 1111 deletions(-)
diffs (truncated from 6341 to 300 lines):
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.66 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: EB7500ATX,v 1.67 2018/08/01 20:04:09 maxv Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.66 $"
+#ident "EB7500ATX-$Revision: 1.67 $"
# estimated number of users
maxusers 32
@@ -233,7 +233,7 @@
pseudo-device tun # network tunneling over tty
pseudo-device tap # virtual Ethernet
#pseudo-device gre # generic L3 over IP tunnel
-#pseudo-device ipfilter # ip filter
+#pseudo-device npf # NPF packet filter
pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
@@ -259,8 +259,6 @@
pseudo-device md # Ramdisk driver
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
-#pseudo-device pf # PF packet filter
-#pseudo-device pflog # PF log if
pseudo-device putter # for puffs and pud
# If the standard modes don't work for your monitor, you can specify
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/acorn32/conf/GENERIC Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.126 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: GENERIC,v 1.127 2018/08/01 20:04:09 maxv Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.126 $"
+#ident "GENERIC-$Revision: 1.127 $"
# estimated number of users
maxusers 32
@@ -292,7 +292,7 @@
pseudo-device tun # network tunneling over tty
pseudo-device tap # virtual Ethernet
#pseudo-device gre # generic L3 over IP tunnel
-#pseudo-device ipfilter # ip filter
+#pseudo-device npf # NPF packet filter
pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
@@ -320,8 +320,6 @@
pseudo-device md # Ramdisk driver
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
-#pseudo-device pf # PF packet filter
-#pseudo-device pflog # PF log if
pseudo-device putter # for puffs and pud
#
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/acorn32/conf/INSTALL Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.80 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: INSTALL,v 1.81 2018/08/01 20:04:09 maxv Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.80 $"
+#ident "INSTALL-$Revision: 1.81 $"
# estimated number of users
maxusers 32
@@ -286,7 +286,7 @@
#pseudo-device tun # network tunneling over tty
#pseudo-device tap # virtual Ethernet
#pseudo-device gre # generic L3 over IP tunnel
-#pseudo-device ipfilter # ip filter
+#pseudo-device npf # NPF packet filter
#pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.74 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.75 2018/08/01 20:04:09 maxv Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -257,7 +257,7 @@
#pseudo-device sl # CSLIP
pseudo-device ppp # PPP
#pseudo-device tun # network tunneling over tty
-#pseudo-device ipfilter # ip filter
+#pseudo-device npf # NPF packet filter
#pseudo-device strip # STRIP
pseudo-device pty # pseudo-terminals
pseudo-device vnd # disk-like interface to files
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/acorn32/conf/NC Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.73 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: NC,v 1.74 2018/08/01 20:04:09 maxv Exp $
#
# NC - with wscons
#
@@ -249,7 +249,7 @@
#pseudo-device sl # CSLIP
#pseudo-device ppp # PPP
#pseudo-device tun # network tunneling over tty
-#pseudo-device ipfilter # ip filter
+#pseudo-device npf # NPF packet filter
#pseudo-device strip # STRIP
pseudo-device pty # pseudo-terminals
pseudo-device vnd # disk-like interface to files
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/algor/conf/P4032
--- a/sys/arch/algor/conf/P4032 Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/algor/conf/P4032 Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P4032,v 1.74 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: P4032,v 1.75 2018/08/01 20:04:09 maxv Exp $
#
# Algorithmics P-4032 kernel.
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P4032-$Revision: 1.74 $"
+#ident "P4032-$Revision: 1.75 $"
maxusers 32
@@ -307,7 +307,7 @@
#pseudo-device raid # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
#pseudo-device fss # file system snapshot device
-pseudo-device ipfilter
+pseudo-device npf # NPF packet filter
pseudo-device loop
pseudo-device md
pseudo-device ppp
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/algor/conf/P5064 Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P5064,v 1.85 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: P5064,v 1.86 2018/08/01 20:04:09 maxv Exp $
#
# Algorithmics P-5064 kernel.
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.85 $"
+#ident "P5064-$Revision: 1.86 $"
maxusers 32
@@ -372,7 +372,7 @@
#pseudo-device raid # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
#pseudo-device fss # file system snapshot device
-pseudo-device ipfilter
+pseudo-device npf # NPF packet filter
pseudo-device loop
pseudo-device md
pseudo-device ppp
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/algor/conf/P6032
--- a/sys/arch/algor/conf/P6032 Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/algor/conf/P6032 Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P6032,v 1.76 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: P6032,v 1.77 2018/08/01 20:04:09 maxv Exp $
#
# Algorithmics P-6032 kernel.
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P6032-$Revision: 1.76 $"
+#ident "P6032-$Revision: 1.77 $"
maxusers 32
@@ -377,7 +377,7 @@
#pseudo-device raid # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
#pseudo-device fss # file system snapshot device
-pseudo-device ipfilter
+pseudo-device npf # NPF packet filter
pseudo-device loop
pseudo-device md
pseudo-device ppp
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/alpha/conf/GENERIC Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.383 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: GENERIC,v 1.384 2018/08/01 20:04:09 maxv 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.383 $"
+ident "GENERIC-$Revision: 1.384 $"
maxusers 32
@@ -111,10 +111,6 @@
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
-options IPFILTER_LOG # ipmon(8) log support
-options IPFILTER_LOOKUP # ippool(8) support
-options IPFILTER_COMPAT # Compat for IP-Filter
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
#options ALTQ # Manipulate network interfaces' output queues
@@ -725,7 +721,7 @@
#options RF_INCLUDE_PARITY_DECLUSTERING=1
#options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device fss # file system snapshot device
-pseudo-device ipfilter
+pseudo-device npf # NPF packet filter
pseudo-device loop
pseudo-device md
pseudo-device ppp
@@ -755,8 +751,6 @@
pseudo-device wsfont
pseudo-device wsmux # mouse and keyboad multiplexing
pseudo-device ksyms # /dev/ksyms
-#pseudo-device pf # PF packet filter
-#pseudo-device pflog # PF log if
pseudo-device lockstat # lock profiling
pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/alpha/conf/RAWHIDE
--- a/sys/arch/alpha/conf/RAWHIDE Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/alpha/conf/RAWHIDE Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.41 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: RAWHIDE,v 1.42 2018/08/01 20:04:09 maxv Exp $
#
# Alpha 4100 stripped for action server kernel.
#
@@ -34,10 +34,6 @@
options INET
options GATEWAY
-options IPFILTER_LOG # ipmon(8) log support
-options IPFILTER_LOOKUP # ippool(8) support
-options IPFILTER_COMPAT # Compat for IP-Filter
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default
include "conf/compat_netbsd12.config"
@@ -98,7 +94,7 @@
pseudo-device bpfilter
pseudo-device ccd
-pseudo-device ipfilter
+pseudo-device npf # NPF packet filter
pseudo-device loop
pseudo-device md
pseudo-device ppp
diff -r 6d5e2e3be750 -r 5157d2fd12bb sys/arch/amiga/conf/DRACO
--- a/sys/arch/amiga/conf/DRACO Wed Aug 01 19:59:49 2018 +0000
+++ b/sys/arch/amiga/conf/DRACO Wed Aug 01 20:04:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.186 2018/02/05 15:18:10 maxv Exp $
+# $NetBSD: DRACO,v 1.187 2018/08/01 20:04:10 maxv Exp $
#
# This file was automatically created.
Home |
Main Index |
Thread Index |
Old Index