Module Name: src
Committed By: maxv
Date: Sat Aug 1 08:20:53 UTC 2020
Modified Files:
src/doc: TODO.smpnet
src/share/man/man4: bridge.4 options.4
src/sys/arch/acorn32/conf: EB7500ATX GENERIC
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
src/sys/arch/amigappc/conf: GENERIC NULL
src/sys/arch/arc/conf: GENERIC
src/sys/arch/bebox/conf: GENERIC
src/sys/arch/cats/conf: GENERIC
src/sys/arch/cesfic/conf: GENERIC
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/dreamcast/conf: G1IDE GENERIC
src/sys/arch/emips/conf: GENERIC
src/sys/arch/evbarm/conf: ARMADILLO210 ARMADILLO9 CUBOX DUOVERO GUMSTIX
HDL_G HPT5325 IYONIX MARVELL_NAS MINI2440 MMNET_GENERIC
MPCSA_GENERIC MV2120 OPENBLOCKS_A6 OPENBLOCKS_AX3 PEPPER SHEEVAPLUG
SMDK2410 SMDK2800 TWINTAIL
src/sys/arch/evbmips/conf: GDIUM LINKITSMART7688 LOONGSON SBMIPS
src/sys/arch/evbppc/conf: EXPLORA451 OPENBLOCKS266 OPENBLOCKS600
src/sys/arch/evbsh3/conf: NEXTVOD
src/sys/arch/ews4800mips/conf: GENERIC
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcmips/conf: GENERIC
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU
src/sys/arch/ia64/conf: GENERIC.SKI
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/luna68k/conf: GENERIC INSTALL
src/sys/arch/mac68k/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/mipsco/conf: GENERIC
src/sys/arch/mmeye/conf: GENERIC MMEYE_WLF
src/sys/arch/mvme68k/conf: GENERIC
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/news68k/conf: GENERIC GENERIC_TINY
src/sys/arch/newsmips/conf: GENERIC
src/sys/arch/next68k/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/pmax/conf: GENERIC GENERIC64
src/sys/arch/prep/conf: GENERIC
src/sys/arch/rs6000/conf: GENERIC
src/sys/arch/sandpoint/conf: ENCPP1 GENERIC SANDPOINT
src/sys/arch/sbmips/conf: GENERIC
src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
src/sys/arch/sparc/conf: GENERIC
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/sun2/conf: GENERIC
src/sys/arch/sun3/conf: DISKLESS GENERIC GENERIC3X
src/sys/arch/vax/conf: GENERIC VAX780
src/sys/arch/x68k/conf: GENERIC
src/sys/conf: files
Log Message:
Remove references to BRIDGE_IPF, it is now compiled in by default.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/doc/TODO.smpnet
cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/bridge.4
cvs rdiff -u -r1.512 -r1.513 src/share/man/man4/options.4
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.402 -r1.403 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.573 -r1.574 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.327 -r1.328 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/amiga/conf/INSTALL
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.162 -r1.163 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/cesfic/conf/GENERIC
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/emips/conf/GENERIC
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/conf/ARMADILLO210
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/conf/ARMADILLO9 \
src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/DUOVERO
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/IYONIX
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/PEPPER
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/evbarm/conf/SMDK2410
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/conf/SMDK2800
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbmips/conf/GDIUM
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/conf/LINKITSMART7688
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/conf/SBMIPS
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbppc/conf/EXPLORA451
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbppc/conf/OPENBLOCKS266
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/OPENBLOCKS600
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbsh3/conf/NEXTVOD
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/ews4800mips/conf/GENERIC
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.242 -r1.243 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.494 -r1.495 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1229 -r1.1230 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ia64/conf/GENERIC.SKI
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/luna68k/conf/INSTALL
cvs rdiff -u -r1.229 -r1.230 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.368 -r1.369 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/mipsco/conf/GENERIC
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/mmeye/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/mvme68k/conf/GENERIC
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/news68k/conf/GENERIC_TINY
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/newsmips/conf/GENERIC
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.200 -r1.201 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/rs6000/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sandpoint/conf/ENCPP1
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sandpoint/conf/SANDPOINT
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sbmips/conf/GENERIC
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.268 -r1.269 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.228 -r1.229 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/sun2/conf/GENERIC
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sun3/conf/DISKLESS
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.1273 -r1.1274 src/sys/conf/files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.38 src/doc/TODO.smpnet:1.39
--- src/doc/TODO.smpnet:1.38 Fri Jul 31 16:59:04 2020
+++ src/doc/TODO.smpnet Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.38 2020/07/31 16:59:04 maxv Exp $
+$NetBSD: TODO.smpnet,v 1.39 2020/08/01 08:20:47 maxv Exp $
MP-safe components
==================
@@ -18,7 +18,6 @@ kernel option. Some components scale up
- Ethernet (if_ethersubr.c)
- bridge(4)
- STP
- - BRIDGE_IPF
- Fast forward (ipflow)
- Layer 3
- All except for items in the below section
Index: src/share/man/man4/bridge.4
diff -u src/share/man/man4/bridge.4:1.12 src/share/man/man4/bridge.4:1.13
--- src/share/man/man4/bridge.4:1.12 Tue Aug 14 06:21:36 2018
+++ src/share/man/man4/bridge.4 Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: bridge.4,v 1.12 2018/08/14 06:21:36 maxv Exp $
+.\" $NetBSD: bridge.4,v 1.13 2020/08/01 08:20:47 maxv Exp $
.\"
.\" Copyright 2001 Wasabi Systems, Inc.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 14, 2018
+.Dd August 1, 2020
.Dt BRIDGE 4
.Os
.Sh NAME
@@ -79,10 +79,6 @@ The
driver implements the IEEE 802.1D Spanning Tree protocol (STP).
Spanning Tree is used to detect and remove loops in a network topology.
.Pp
-Transparent filtering for IP and IPv6 packets can be added with the kernel
-configuration option
-.Cd options BRIDGE_IPF .
-.Pp
When filtering is enabled, bridged packets will pass through the filter
inbound on the originating interface and outbound on the appropriate
interfaces.
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.512 src/share/man/man4/options.4:1.513
--- src/share/man/man4/options.4:1.512 Fri Apr 24 13:54:56 2020
+++ src/share/man/man4/options.4 Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.512 2020/04/24 13:54:56 jdolecek Exp $
+.\" $NetBSD: options.4,v 1.513 2020/08/01 08:20:47 maxv Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd April 24, 2020
+.Dd August 1, 2020
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -1956,13 +1956,6 @@ This option enables older IP-Filter bina
.It Cd options IPFILTER_DEFAULT_BLOCK
This option sets the default policy of IP-Filter.
If it is set, IP-Filter will block packets by default.
-.It Cd options BRIDGE_IPF
-This option causes
-.Em bridge
-devices to use the IP and/or IPv6 filtering hooks, forming
-a link-layer filter that uses protocol-layer rules.
-This option assumes the presence of
-.Em pseudo-device ipfilter .
.It Cd options MBUFTRACE
This option can help track down mbuf leaks.
When enabled, mbufs are tagged with the devices and protocols using them.
Index: src/sys/arch/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.71 src/sys/arch/acorn32/conf/EB7500ATX:1.72
--- src/sys/arch/acorn32/conf/EB7500ATX:1.71 Sat Apr 18 11:00:37 2020
+++ src/sys/arch/acorn32/conf/EB7500ATX Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.71 2020/04/18 11:00:37 skrll Exp $
+# $NetBSD: EB7500ATX,v 1.72 2020/08/01 08:20:47 maxv 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.71 $"
+#ident "EB7500ATX-$Revision: 1.72 $"
# estimated number of users
maxusers 32
@@ -239,7 +239,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device pty # pseudo-terminals
pseudo-device vnd # disk-like interface to files
pseudo-device ccd # concatenated disk devices
Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.131 src/sys/arch/acorn32/conf/GENERIC:1.132
--- src/sys/arch/acorn32/conf/GENERIC:1.131 Sat Apr 18 11:00:37 2020
+++ src/sys/arch/acorn32/conf/GENERIC Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2020/04/18 11:00:37 skrll Exp $
+# $NetBSD: GENERIC,v 1.132 2020/08/01 08:20:47 maxv 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.131 $"
+#ident "GENERIC-$Revision: 1.132 $"
# estimated number of users
maxusers 32
@@ -298,7 +298,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
pseudo-device vnd # disk-like interface to files
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.402 src/sys/arch/alpha/conf/GENERIC:1.403
--- src/sys/arch/alpha/conf/GENERIC:1.402 Sat May 16 13:46:10 2020
+++ src/sys/arch/alpha/conf/GENERIC Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.402 2020/05/16 13:46:10 maya Exp $
+# $NetBSD: GENERIC,v 1.403 2020/08/01 08:20:47 maxv 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.402 $"
+ident "GENERIC-$Revision: 1.403 $"
maxusers 32
@@ -734,7 +734,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device sequencer # MIDI sequencer
#options RND_COM # use "com" randomness too
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.158 src/sys/arch/amd64/conf/ALL:1.159
--- src/sys/arch/amd64/conf/ALL:1.158 Sun Jul 26 14:51:18 2020
+++ src/sys/arch/amd64/conf/ALL Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.158 2020/07/26 14:51:18 jdolecek Exp $
+# $NetBSD: ALL,v 1.159 2020/08/01 08:20:47 maxv 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/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.158 $"
+#ident "ALL-$Revision: 1.159 $"
maxusers 64 # estimated number of users
@@ -1633,7 +1633,6 @@ pseudo-device faith # IPv[46] tcp rela
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device l2tp # L2TPv3 interface
#pseudo-device pf # PF packet filter
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.573 src/sys/arch/amd64/conf/GENERIC:1.574
--- src/sys/arch/amd64/conf/GENERIC:1.573 Sun Jul 19 14:31:31 2020
+++ src/sys/arch/amd64/conf/GENERIC Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.573 2020/07/19 14:31:31 maxv Exp $
+# $NetBSD: GENERIC,v 1.574 2020/08/01 08:20:47 maxv 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.573 $"
+#ident "GENERIC-$Revision: 1.574 $"
maxusers 64 # estimated number of users
@@ -1169,7 +1169,6 @@ pseudo-device ipsecif # tunnel interfa
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.182 src/sys/arch/amd64/conf/XEN3_DOM0:1.183
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.182 Tue Jul 28 09:38:06 2020
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.182 2020/07/28 09:38:06 jdolecek Exp $
+# $NetBSD: XEN3_DOM0,v 1.183 2020/08/01 08:20:47 maxv Exp $
include "arch/amd64/conf/std.xen"
@@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.182 $"
+#ident "XEN3_DOM0-$Revision: 1.183 $"
maxusers 32 # estimated number of users
@@ -843,7 +843,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.93 src/sys/arch/amd64/conf/XEN3_DOMU:1.94
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.93 Sat Apr 25 16:10:06 2020
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.93 2020/04/25 16:10:06 bouyer Exp $
+# $NetBSD: XEN3_DOMU,v 1.94 2020/08/01 08:20:47 maxv Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOMU-$Revision: 1.93 $"
+#ident "XEN3_DOMU-$Revision: 1.94 $"
maxusers 32 # estimated number of users
@@ -193,7 +193,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.192 src/sys/arch/amiga/conf/DRACO:1.193
--- src/sys/arch/amiga/conf/DRACO:1.192 Sun May 3 10:06:29 2020
+++ src/sys/arch/amiga/conf/DRACO Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.192 2020/05/03 10:06:29 rin Exp $
+# $NetBSD: DRACO,v 1.193 2020/08/01 08:20:47 maxv 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.192 $"
+#ident "GENERIC-$Revision: 1.193 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -312,7 +312,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device fss # file system snapshot device
pseudo-device putter # for puffs and pud
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.327 src/sys/arch/amiga/conf/GENERIC:1.328
--- src/sys/arch/amiga/conf/GENERIC:1.327 Sun May 3 10:06:29 2020
+++ src/sys/arch/amiga/conf/GENERIC Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.327 2020/05/03 10:06:29 rin Exp $
+# $NetBSD: GENERIC,v 1.328 2020/08/01 08:20:47 maxv 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.327 $"
+#ident "GENERIC-$Revision: 1.328 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -558,7 +558,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device fss # file system snapshot device
pseudo-device putter # for puffs and pud
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.143 src/sys/arch/amiga/conf/GENERIC.in:1.144
--- src/sys/arch/amiga/conf/GENERIC.in:1.143 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/amiga/conf/GENERIC.in Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.143 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: GENERIC.in,v 1.144 2020/08/01 08:20:47 maxv 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.143 $"
+#ident "GENERIC-$Revision: 1.144 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -651,7 +651,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
#pseudo-device fss # file system snapshot device
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.133 src/sys/arch/amiga/conf/INSTALL:1.134
--- src/sys/arch/amiga/conf/INSTALL:1.133 Sun May 3 10:06:29 2020
+++ src/sys/arch/amiga/conf/INSTALL Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.133 2020/05/03 10:06:29 rin Exp $
+# $NetBSD: INSTALL,v 1.134 2020/08/01 08:20:47 maxv 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.133 $"
+#ident "GENERIC-$Revision: 1.134 $"
makeoptions COPTS="-Os"
@@ -504,7 +504,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device fss # file system snapshot device
#pseudo-device putter # for puffs and pud
Index: src/sys/arch/amigappc/conf/GENERIC
diff -u src/sys/arch/amigappc/conf/GENERIC:1.38 src/sys/arch/amigappc/conf/GENERIC:1.39
--- src/sys/arch/amigappc/conf/GENERIC:1.38 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/amigappc/conf/GENERIC Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.38 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.39 2020/08/01 08:20:47 maxv 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.38 $"
+#ident "GENERIC-$Revision: 1.39 $"
maxusers 8
@@ -398,7 +398,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device fss # file system snapshot device
Index: src/sys/arch/amigappc/conf/NULL
diff -u src/sys/arch/amigappc/conf/NULL:1.57 src/sys/arch/amigappc/conf/NULL:1.58
--- src/sys/arch/amigappc/conf/NULL:1.57 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/amigappc/conf/NULL Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.57 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: NULL,v 1.58 2020/08/01 08:20:47 maxv 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.57 $"
+#ident "GENERIC-$Revision: 1.58 $"
maxusers 8
@@ -380,7 +380,6 @@ pseudo-device loop # loopback network
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device fss # file system snapshot device
Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.198 src/sys/arch/arc/conf/GENERIC:1.199
--- src/sys/arch/arc/conf/GENERIC:1.198 Fri May 29 23:24:39 2020
+++ src/sys/arch/arc/conf/GENERIC Sat Aug 1 08:20:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.198 2020/05/29 23:24:39 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.199 2020/08/01 08:20:47 maxv 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.198 $"
+#ident "GENERIC-$Revision: 1.199 $"
maxusers 32 # estimated number of users
@@ -457,7 +457,6 @@ pseudo-device tap # virtual Ethernet
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.162 src/sys/arch/bebox/conf/GENERIC:1.163
--- src/sys/arch/bebox/conf/GENERIC:1.162 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/bebox/conf/GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.162 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.163 2020/08/01 08:20:48 maxv 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.162 $"
+#ident "GENERIC-$Revision: 1.163 $"
maxusers 32
@@ -286,7 +286,6 @@ pseudo-device tun # network tunneling
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.181 src/sys/arch/cats/conf/GENERIC:1.182
--- src/sys/arch/cats/conf/GENERIC:1.181 Sat May 16 13:46:10 2020
+++ src/sys/arch/cats/conf/GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.181 2020/05/16 13:46:10 maya Exp $
+# $NetBSD: GENERIC,v 1.182 2020/08/01 08:20:48 maxv Exp $
#
# GENERIC machine description file
#
@@ -541,7 +541,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/cesfic/conf/GENERIC
diff -u src/sys/arch/cesfic/conf/GENERIC:1.72 src/sys/arch/cesfic/conf/GENERIC:1.73
--- src/sys/arch/cesfic/conf/GENERIC:1.72 Fri Apr 26 21:40:29 2019
+++ src/sys/arch/cesfic/conf/GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.72 2019/04/26 21:40:29 sevan Exp $
+# $NetBSD: GENERIC,v 1.73 2020/08/01 08:20:48 maxv Exp $
#
# GENERIC machine description file
#
@@ -123,7 +123,6 @@ pseudo-device pty # pseudo ptys
#pseudo-device bpfilter # Berkeley packet filter
pseudo-device carp # Common Address Redundancy Protocol
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device vnd # vnode pseudo-disks
#options VND_COMPRESSION # compressed vnd(4)
#pseudo-device ccd # concatenated disk devices
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.168 src/sys/arch/cobalt/conf/GENERIC:1.169
--- src/sys/arch/cobalt/conf/GENERIC:1.168 Tue Jun 16 06:36:56 2020
+++ src/sys/arch/cobalt/conf/GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2020/06/16 06:36:56 thorpej Exp $
+# $NetBSD: GENERIC,v 1.169 2020/08/01 08:20:48 maxv 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.168 $"
+#ident "GENERIC-$Revision: 1.169 $"
maxusers 32
@@ -322,7 +322,6 @@ pseudo-device pppoe # PPP over Ethern
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.74 src/sys/arch/cobalt/conf/INSTALL:1.75
--- src/sys/arch/cobalt/conf/INSTALL:1.74 Sat Jan 25 18:38:35 2020
+++ src/sys/arch/cobalt/conf/INSTALL Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.74 2020/01/25 18:38:35 thorpej Exp $
+# $NetBSD: INSTALL,v 1.75 2020/08/01 08:20:48 maxv 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.74 $"
+#ident "INSTALL-$Revision: 1.75 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -301,7 +301,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# Miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/dreamcast/conf/G1IDE
diff -u src/sys/arch/dreamcast/conf/G1IDE:1.7 src/sys/arch/dreamcast/conf/G1IDE:1.8
--- src/sys/arch/dreamcast/conf/G1IDE:1.7 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/dreamcast/conf/G1IDE Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: G1IDE,v 1.7 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: G1IDE,v 1.8 2020/08/01 08:20:48 maxv Exp $
include "arch/dreamcast/conf/std.dreamcast"
@@ -204,7 +204,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.132 src/sys/arch/dreamcast/conf/GENERIC:1.133
--- src/sys/arch/dreamcast/conf/GENERIC:1.132 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/dreamcast/conf/GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.132 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GENERIC,v 1.133 2020/08/01 08:20:48 maxv Exp $
#
# GENERIC machine description file
#
@@ -204,7 +204,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/emips/conf/GENERIC
diff -u src/sys/arch/emips/conf/GENERIC:1.22 src/sys/arch/emips/conf/GENERIC:1.23
--- src/sys/arch/emips/conf/GENERIC:1.22 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/emips/conf/GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.22 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC,v 1.23 2020/08/01 08:20:48 maxv 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.22 $"
+#ident "GENERIC-$Revision: 1.23 $"
maxusers 64
@@ -186,7 +186,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device vnd # virtual disk ick
Index: src/sys/arch/evbarm/conf/ARMADILLO210
diff -u src/sys/arch/evbarm/conf/ARMADILLO210:1.45 src/sys/arch/evbarm/conf/ARMADILLO210:1.46
--- src/sys/arch/evbarm/conf/ARMADILLO210:1.45 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO210 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO210,v 1.45 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: ARMADILLO210,v 1.46 2020/08/01 08:20:48 maxv Exp $
#
# ARMADILLO210 -- Atmark Techno, Armadillo-210
#
@@ -183,7 +183,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device kttcp # network loopback
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.62 src/sys/arch/evbarm/conf/ARMADILLO9:1.63
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.62 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.62 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: ARMADILLO9,v 1.63 2020/08/01 08:20:48 maxv Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -270,7 +270,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device kttcp # network loopback
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.62 src/sys/arch/evbarm/conf/HDL_G:1.63
--- src/sys/arch/evbarm/conf/HDL_G:1.62 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/HDL_G Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.62 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: HDL_G,v 1.63 2020/08/01 08:20:48 maxv Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -396,7 +396,6 @@ pseudo-device faith # IPv[46] tcp rela
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device kttcp
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.17 src/sys/arch/evbarm/conf/CUBOX:1.18
--- src/sys/arch/evbarm/conf/CUBOX:1.17 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/CUBOX Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.17 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: CUBOX,v 1.18 2020/08/01 08:20:48 maxv Exp $
#
# CUBOX -- SolidRun Ltd. Cubox kernel
#
@@ -335,7 +335,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device npf # NPF packet filter
Index: src/sys/arch/evbarm/conf/DUOVERO
diff -u src/sys/arch/evbarm/conf/DUOVERO:1.18 src/sys/arch/evbarm/conf/DUOVERO:1.19
--- src/sys/arch/evbarm/conf/DUOVERO:1.18 Sat Jun 13 16:51:25 2020
+++ src/sys/arch/evbarm/conf/DUOVERO Sat Aug 1 08:20:48 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: DUOVERO,v 1.18 2020/06/13 16:51:25 ad Exp $
+# $NetBSD: DUOVERO,v 1.19 2020/08/01 08:20:48 maxv Exp $
#
# DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
#
@@ -267,7 +267,6 @@ pseudo-device tap # virtual Ethernet
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.104 src/sys/arch/evbarm/conf/GUMSTIX:1.105
--- src/sys/arch/evbarm/conf/GUMSTIX:1.104 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/GUMSTIX Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.104 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: GUMSTIX,v 1.105 2020/08/01 08:20:48 maxv Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -363,7 +363,6 @@ pseudo-device tap # virtual Ethernet
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.47 src/sys/arch/evbarm/conf/HPT5325:1.48
--- src/sys/arch/evbarm/conf/HPT5325:1.47 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/HPT5325 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.47 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: HPT5325,v 1.48 2020/08/01 08:20:48 maxv Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -459,7 +459,6 @@ pseudo-device tap # virtual Ethernet
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/IYONIX
diff -u src/sys/arch/evbarm/conf/IYONIX:1.6 src/sys/arch/evbarm/conf/IYONIX:1.7
--- src/sys/arch/evbarm/conf/IYONIX:1.6 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/IYONIX Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: IYONIX,v 1.6 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: IYONIX,v 1.7 2020/08/01 08:20:48 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 32 # estimated number of users
@@ -384,7 +384,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.38 src/sys/arch/evbarm/conf/MARVELL_NAS:1.39
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.38 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/MARVELL_NAS Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MARVELL_NAS,v 1.38 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: MARVELL_NAS,v 1.39 2020/08/01 08:20:48 maxv Exp $
#
# This configuration supports for generically Marvell NAS.
@@ -280,7 +280,6 @@ pseudo-device tun # network tunneling
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device npf # NPF packet filter
Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.30 src/sys/arch/evbarm/conf/MINI2440:1.31
--- src/sys/arch/evbarm/conf/MINI2440:1.30 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/MINI2440 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MINI2440,v 1.30 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: MINI2440,v 1.31 2020/08/01 08:20:48 maxv Exp $
#
# MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
#
@@ -365,7 +365,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.51 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.52
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.51 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.51 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: MMNET_GENERIC,v 1.52 2020/08/01 08:20:48 maxv 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.51 $"
+#ident "GENERIC-$Revision: 1.52 $"
maxusers 32 # estimated number of users
@@ -558,7 +558,6 @@ pseudo-device tun # network tunneling
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.72 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.73
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.72 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.72 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.73 2020/08/01 08:20:48 maxv 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.72 $"
+#ident "GENERIC-$Revision: 1.73 $"
maxusers 32 # estimated number of users
@@ -623,7 +623,6 @@ pseudo-device tun # network tunneling
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.42 src/sys/arch/evbarm/conf/MV2120:1.43
--- src/sys/arch/evbarm/conf/MV2120:1.42 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/MV2120 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MV2120,v 1.42 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: MV2120,v 1.43 2020/08/01 08:20:48 maxv Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@@ -279,7 +279,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.39 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.40
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.39 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.39 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.40 2020/08/01 08:20:48 maxv Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@@ -351,7 +351,6 @@ pseudo-device faith # IPv[46] TCP rela
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.31 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.32
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.31 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.31 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.32 2020/08/01 08:20:48 maxv Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -288,7 +288,6 @@ pseudo-device faith # IPv[46] TCP rela
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/PEPPER
diff -u src/sys/arch/evbarm/conf/PEPPER:1.16 src/sys/arch/evbarm/conf/PEPPER:1.17
--- src/sys/arch/evbarm/conf/PEPPER:1.16 Sat Jun 13 16:51:25 2020
+++ src/sys/arch/evbarm/conf/PEPPER Sat Aug 1 08:20:48 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: PEPPER,v 1.16 2020/06/13 16:51:25 ad Exp $
+# $NetBSD: PEPPER,v 1.17 2020/08/01 08:20:48 maxv Exp $
#
# PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
#
@@ -329,7 +329,6 @@ pseudo-device tap # virtual Ethernet
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.69 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.70
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.69 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.69 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: SHEEVAPLUG,v 1.70 2020/08/01 08:20:48 maxv Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -457,7 +457,6 @@ pseudo-device tap # virtual Ethernet
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbarm/conf/SMDK2410
diff -u src/sys/arch/evbarm/conf/SMDK2410:1.75 src/sys/arch/evbarm/conf/SMDK2410:1.76
--- src/sys/arch/evbarm/conf/SMDK2410:1.75 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/SMDK2410 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2410,v 1.75 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: SMDK2410,v 1.76 2020/08/01 08:20:48 maxv Exp $
#
# SMDK2410 -- Samsung's S3C2410 evaluation board.
#
@@ -340,7 +340,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/evbarm/conf/SMDK2800
diff -u src/sys/arch/evbarm/conf/SMDK2800:1.63 src/sys/arch/evbarm/conf/SMDK2800:1.64
--- src/sys/arch/evbarm/conf/SMDK2800:1.63 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/SMDK2800 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2800,v 1.63 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: SMDK2800,v 1.64 2020/08/01 08:20:48 maxv Exp $
#
# SMDK2800 -- Samsung's S3C2800 evaluation board.
#
@@ -220,7 +220,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.81 src/sys/arch/evbarm/conf/TWINTAIL:1.82
--- src/sys/arch/evbarm/conf/TWINTAIL:1.81 Tue May 19 09:17:45 2020
+++ src/sys/arch/evbarm/conf/TWINTAIL Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.81 2020/05/19 09:17:45 rin Exp $
+# $NetBSD: TWINTAIL,v 1.82 2020/08/01 08:20:48 maxv Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -369,7 +369,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/evbmips/conf/GDIUM
diff -u src/sys/arch/evbmips/conf/GDIUM:1.37 src/sys/arch/evbmips/conf/GDIUM:1.38
--- src/sys/arch/evbmips/conf/GDIUM:1.37 Fri Jan 3 03:44:42 2020
+++ src/sys/arch/evbmips/conf/GDIUM Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM,v 1.37 2020/01/03 03:44:42 thorpej Exp $
+# $NetBSD: GDIUM,v 1.38 2020/08/01 08:20:48 maxv Exp $
#
# GDIUM 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.37 $"
+#ident "GDIUM-$Revision: 1.38 $"
maxusers 16
@@ -260,7 +260,6 @@ pseudo-device vlan
## Simple inter-network traffic bridging
pseudo-device bridge
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device ksyms # /dev/ksyms
Index: src/sys/arch/evbmips/conf/LINKITSMART7688
diff -u src/sys/arch/evbmips/conf/LINKITSMART7688:1.13 src/sys/arch/evbmips/conf/LINKITSMART7688:1.14
--- src/sys/arch/evbmips/conf/LINKITSMART7688:1.13 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbmips/conf/LINKITSMART7688 Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: LINKITSMART7688,v 1.13 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: LINKITSMART7688,v 1.14 2020/08/01 08:20:48 maxv Exp $
#
# MediaTek MT7688
#
@@ -250,7 +250,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device npf # NPF packet filter
#pseudo-device l2tp # L2TPv3 interface
Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.43 src/sys/arch/evbmips/conf/LOONGSON:1.44
--- src/sys/arch/evbmips/conf/LOONGSON:1.43 Fri Jan 3 03:44:42 2020
+++ src/sys/arch/evbmips/conf/LOONGSON Sat Aug 1 08:20:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.43 2020/01/03 03:44:42 thorpej Exp $
+# $NetBSD: LOONGSON,v 1.44 2020/08/01 08:20:48 maxv 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.43 $"
+#ident "LOONGSON-$Revision: 1.44 $"
maxusers 16
@@ -296,7 +296,6 @@ pseudo-device vlan
## Simple inter-network traffic bridging
pseudo-device bridge
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device ksyms # /dev/ksyms
pseudo-device drvctl # driver control
Index: src/sys/arch/evbmips/conf/SBMIPS
diff -u src/sys/arch/evbmips/conf/SBMIPS:1.10 src/sys/arch/evbmips/conf/SBMIPS:1.11
--- src/sys/arch/evbmips/conf/SBMIPS:1.10 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/SBMIPS Sat Aug 1 08:20:48 2020
@@ -1,10 +1,10 @@
-# $NetBSD: SBMIPS,v 1.10 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: SBMIPS,v 1.11 2020/08/01 08:20:48 maxv Exp $
include "arch/evbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
#options LOCKDEBUG # XXX XXX XXX XXX
#options DEBUG # extra kernel debugging support
@@ -189,7 +189,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/evbppc/conf/EXPLORA451
diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.66 src/sys/arch/evbppc/conf/EXPLORA451:1.67
--- src/sys/arch/evbppc/conf/EXPLORA451:1.66 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbppc/conf/EXPLORA451 Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: EXPLORA451,v 1.66 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: EXPLORA451,v 1.67 2020/08/01 08:20:49 maxv Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -166,7 +166,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266:1.76 src/sys/arch/evbppc/conf/OPENBLOCKS266:1.77
--- src/sys/arch/evbppc/conf/OPENBLOCKS266:1.76 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266 Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266,v 1.76 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: OPENBLOCKS266,v 1.77 2020/08/01 08:20:49 maxv Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.obs266"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OPENBLOCKS266-$Revision: 1.76 $"
+#ident "OPENBLOCKS266-$Revision: 1.77 $"
maxusers 32
@@ -195,7 +195,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IPv[46] pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbppc/conf/OPENBLOCKS600
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS600:1.28 src/sys/arch/evbppc/conf/OPENBLOCKS600:1.29
--- src/sys/arch/evbppc/conf/OPENBLOCKS600:1.28 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbppc/conf/OPENBLOCKS600 Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS600,v 1.28 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: OPENBLOCKS600,v 1.29 2020/08/01 08:20:49 maxv 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.28 $"
+#ident "OPENBLOCKS600-$Revision: 1.29 $"
maxusers 32
@@ -198,7 +198,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IPv[46] pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/evbsh3/conf/NEXTVOD
diff -u src/sys/arch/evbsh3/conf/NEXTVOD:1.2 src/sys/arch/evbsh3/conf/NEXTVOD:1.3
--- src/sys/arch/evbsh3/conf/NEXTVOD:1.2 Mon Jul 20 02:04:43 2020
+++ src/sys/arch/evbsh3/conf/NEXTVOD Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NEXTVOD,v 1.2 2020/07/20 02:04:43 uwe Exp $
+# $NetBSD: NEXTVOD,v 1.3 2020/08/01 08:20:49 maxv Exp $
# This config and related files are placeholders/boilerplate for work
# in progress. Not expected to compile.
@@ -6,7 +6,7 @@
include "arch/evbsh3/conf/std.nextvod"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NEXTVOD-$Revision: 1.2 $"
+#ident "NEXTVOD-$Revision: 1.3 $"
maxusers 32 # estimated number of users
@@ -152,7 +152,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device l2tp # L2TPv3 interface
#pseudo-device npf # NPF packet filter
Index: src/sys/arch/ews4800mips/conf/GENERIC
diff -u src/sys/arch/ews4800mips/conf/GENERIC:1.60 src/sys/arch/ews4800mips/conf/GENERIC:1.61
--- src/sys/arch/ews4800mips/conf/GENERIC:1.60 Wed Mar 25 17:06:18 2020
+++ src/sys/arch/ews4800mips/conf/GENERIC Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.60 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.61 2020/08/01 08:20:49 maxv 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.ews4
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.60 $"
+#ident "GENERIC-$Revision: 1.61 $"
maxusers 16
@@ -242,7 +242,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.203 src/sys/arch/hp300/conf/GENERIC:1.204
--- src/sys/arch/hp300/conf/GENERIC:1.203 Fri Apr 26 21:40:30 2019
+++ src/sys/arch/hp300/conf/GENERIC Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.203 2019/04/26 21:40:30 sevan Exp $
+# $NetBSD: GENERIC,v 1.204 2020/08/01 08:20:49 maxv 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.203 $"
+#ident "GENERIC-$Revision: 1.204 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -288,7 +288,6 @@ pseudo-device vnd # vnode pseudo-disks
# network pseudo-devices
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device bpfilter # Berkeley packet filter
pseudo-device carp # Common Address Redundancy Protocol
Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.242 src/sys/arch/hpcmips/conf/GENERIC:1.243
--- src/sys/arch/hpcmips/conf/GENERIC:1.242 Sat May 16 13:46:11 2020
+++ src/sys/arch/hpcmips/conf/GENERIC Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.242 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: GENERIC,v 1.243 2020/08/01 08:20:49 maxv Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.242 $"
+#ident "GENERIC-$Revision: 1.243 $"
maxusers 16
@@ -695,7 +695,6 @@ pseudo-device vlan
## Simple inter-network traffic bridging
pseudo-device bridge
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device ksyms # /dev/ksyms
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.34 src/sys/arch/hppa/conf/GENERIC:1.35
--- src/sys/arch/hppa/conf/GENERIC:1.34 Sat May 16 13:46:11 2020
+++ src/sys/arch/hppa/conf/GENERIC Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.34 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: GENERIC,v 1.35 2020/08/01 08:20:49 maxv Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.34 $"
+#ident "GENERIC-$Revision: 1.35 $"
maxusers 32 # estimated number of users
@@ -729,7 +729,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.494 src/sys/arch/i386/conf/ALL:1.495
--- src/sys/arch/i386/conf/ALL:1.494 Tue Jul 14 00:45:52 2020
+++ src/sys/arch/i386/conf/ALL Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.494 2020/07/14 00:45:52 yamaguchi Exp $
+# $NetBSD: ALL,v 1.495 2020/08/01 08:20:49 maxv 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.494 $"
+#ident "ALL-$Revision: 1.495 $"
maxusers 64 # estimated number of users
@@ -1748,7 +1748,6 @@ pseudo-device faith # IPv[46] tcp rela
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pf # PF packet filter
pseudo-device pflog # PF log if
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1229 src/sys/arch/i386/conf/GENERIC:1.1230
--- src/sys/arch/i386/conf/GENERIC:1.1229 Sat Apr 25 16:10:06 2020
+++ src/sys/arch/i386/conf/GENERIC Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1229 2020/04/25 16:10:06 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1230 2020/08/01 08:20:49 maxv 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.1229 $"
+#ident "GENERIC-$Revision: 1.1230 $"
maxusers 64 # estimated number of users
@@ -1469,7 +1469,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.30 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.31
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.30 Tue Jul 28 09:38:06 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.30 2020/07/28 09:38:06 jdolecek Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.31 2020/08/01 08:20:49 maxv Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -818,7 +818,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.13 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.14
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.13 Sat Apr 25 16:10:06 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.13 2020/04/25 16:10:06 bouyer Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.14 2020/08/01 08:20:49 maxv Exp $
include "arch/i386/conf/std.xen"
@@ -208,7 +208,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
Index: src/sys/arch/ia64/conf/GENERIC.SKI
diff -u src/sys/arch/ia64/conf/GENERIC.SKI:1.16 src/sys/arch/ia64/conf/GENERIC.SKI:1.17
--- src/sys/arch/ia64/conf/GENERIC.SKI:1.16 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/ia64/conf/GENERIC.SKI Sat Aug 1 08:20:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.SKI,v 1.16 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: GENERIC.SKI,v 1.17 2020/08/01 08:20:49 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.16 $"
+#ident "GENERIC-$Revision: 1.17 $"
maxusers 32 # estimated number of users
@@ -146,7 +146,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device npf # NPF packet filter
#pseudo-device l2tp # L2TPv3 interface
Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.111 src/sys/arch/iyonix/conf/GENERIC:1.112
--- src/sys/arch/iyonix/conf/GENERIC:1.111 Sat Apr 18 11:00:41 2020
+++ src/sys/arch/iyonix/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.111 2020/04/18 11:00:41 skrll Exp $
+# $NetBSD: GENERIC,v 1.112 2020/08/01 08:20:50 maxv 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.111 $"
+#ident "GENERIC-$Revision: 1.112 $"
maxusers 32 # estimated number of users
@@ -384,7 +384,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.67 src/sys/arch/landisk/conf/GENERIC:1.68
--- src/sys/arch/landisk/conf/GENERIC:1.67 Sat May 16 13:46:11 2020
+++ src/sys/arch/landisk/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.67 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: GENERIC,v 1.68 2020/08/01 08:20:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.67 $"
+#ident "GENERIC-$Revision: 1.68 $"
maxusers 16 # estimated number of users
@@ -439,7 +439,6 @@ pseudo-device gif # IPv[46] over IPv[4
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
# miscellaneous pseudo-devices
Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.127 src/sys/arch/luna68k/conf/GENERIC:1.128
--- src/sys/arch/luna68k/conf/GENERIC:1.127 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/luna68k/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GENERIC,v 1.128 2020/08/01 08:20:50 maxv 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.127 $"
+#ident "GENERIC-$Revision: 1.128 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -193,7 +193,6 @@ pseudo-device fss # file system snapsh
#pseudo-device tap # virtual Ethernet
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device vnd # disk-like interface to files
#options VND_COMPRESSION # compressed vnd(4)
Index: src/sys/arch/luna68k/conf/INSTALL
diff -u src/sys/arch/luna68k/conf/INSTALL:1.29 src/sys/arch/luna68k/conf/INSTALL:1.30
--- src/sys/arch/luna68k/conf/INSTALL:1.29 Tue May 19 09:14:52 2020
+++ src/sys/arch/luna68k/conf/INSTALL Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.29 2020/05/19 09:14:52 rin Exp $
+# $NetBSD: INSTALL,v 1.30 2020/08/01 08:20:50 maxv Exp $
#
# config for installation ramdisk kernel
#
@@ -170,7 +170,6 @@ pseudo-device pty # pseudo-terminals
#pseudo-device tap # virtual Ethernet
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device vnd # disk-like interface to files
#options VND_COMPRESSION # compressed vnd(4)
Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.229 src/sys/arch/mac68k/conf/GENERIC:1.230
--- src/sys/arch/mac68k/conf/GENERIC:1.229 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mac68k/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.229 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: GENERIC,v 1.230 2020/08/01 08:20:50 maxv 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.229 $"
+#ident "GENERIC-$Revision: 1.230 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -317,7 +317,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.368 src/sys/arch/macppc/conf/GENERIC:1.369
--- src/sys/arch/macppc/conf/GENERIC:1.368 Sun Apr 26 23:03:37 2020
+++ src/sys/arch/macppc/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.368 2020/04/26 23:03:37 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.369 2020/08/01 08:20:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.368 $"
+#ident "GENERIC-$Revision: 1.369 $"
maxusers 32
@@ -546,7 +546,6 @@ pseudo-device ipsecif # tunnel interfa
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
pseudo-device openfirm # /dev/openfirm
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.26 src/sys/arch/macppc/conf/GENERIC_601:1.27
--- src/sys/arch/macppc/conf/GENERIC_601:1.26 Wed Mar 25 17:06:19 2020
+++ src/sys/arch/macppc/conf/GENERIC_601 Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.26 2020/03/25 17:06:19 jdolecek Exp $
+# $NetBSD: GENERIC_601,v 1.27 2020/08/01 08:20:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.26 $"
+ident "GENERIC-$Revision: 1.27 $"
maxusers 32
@@ -341,7 +341,6 @@ pseudo-device bpfilter # packet filter
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
pseudo-device openfirm # /dev/openfirm
Index: src/sys/arch/mipsco/conf/GENERIC
diff -u src/sys/arch/mipsco/conf/GENERIC:1.95 src/sys/arch/mipsco/conf/GENERIC:1.96
--- src/sys/arch/mipsco/conf/GENERIC:1.95 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mipsco/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.95 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: GENERIC,v 1.96 2020/08/01 08:20:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -172,7 +172,6 @@ pseudo-device fss # file system snapsh
#pseudo-device npf # NPF packet filter
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device clockctl # user control of clock subsystem
Index: src/sys/arch/mmeye/conf/GENERIC
diff -u src/sys/arch/mmeye/conf/GENERIC:1.127 src/sys/arch/mmeye/conf/GENERIC:1.128
--- src/sys/arch/mmeye/conf/GENERIC:1.127 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mmeye/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: GENERIC,v 1.128 2020/08/01 08:20:50 maxv 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.127 $"
+#ident "GENERIC-$Revision: 1.128 $"
maxusers 16 # estimated number of users
@@ -211,7 +211,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
pseudo-device vcoda # coda minicache <-> venus comm.
Index: src/sys/arch/mmeye/conf/MMEYE_WLF
diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.29 src/sys/arch/mmeye/conf/MMEYE_WLF:1.30
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.29 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mmeye/conf/MMEYE_WLF Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.29 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMEYE_WLF,v 1.30 2020/08/01 08:20:50 maxv 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.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 16 # estimated number of users
@@ -243,7 +243,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
pseudo-device vcoda # coda minicache <-> venus comm.
Index: src/sys/arch/mvme68k/conf/GENERIC
diff -u src/sys/arch/mvme68k/conf/GENERIC:1.100 src/sys/arch/mvme68k/conf/GENERIC:1.101
--- src/sys/arch/mvme68k/conf/GENERIC:1.100 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/mvme68k/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.100 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GENERIC,v 1.101 2020/08/01 08:20:50 maxv 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.100 $"
+#ident "GENERIC-$Revision: 1.101 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -128,7 +128,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
#pseudo-device cgd # cryptographic disk devices
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.139 src/sys/arch/netwinder/conf/GENERIC:1.140
--- src/sys/arch/netwinder/conf/GENERIC:1.139 Sat Apr 18 11:00:42 2020
+++ src/sys/arch/netwinder/conf/GENERIC Sat Aug 1 08:20:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.139 2020/04/18 11:00:42 skrll Exp $
+# $NetBSD: GENERIC,v 1.140 2020/08/01 08:20:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -277,7 +277,6 @@ pseudo-device bpfilter # Berkeley packe
pseudo-device carp # Common Address Redundancy Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device loop # network loopback
#
Index: src/sys/arch/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.134 src/sys/arch/news68k/conf/GENERIC:1.135
--- src/sys/arch/news68k/conf/GENERIC:1.134 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/news68k/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.134 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: GENERIC,v 1.135 2020/08/01 08:20:51 maxv 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.134 $"
+#ident "GENERIC-$Revision: 1.135 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -242,7 +242,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device vcoda # coda minicache <-> venus comm.
pseudo-device clockctl # user control of clock subsystem
Index: src/sys/arch/news68k/conf/GENERIC_TINY
diff -u src/sys/arch/news68k/conf/GENERIC_TINY:1.89 src/sys/arch/news68k/conf/GENERIC_TINY:1.90
--- src/sys/arch/news68k/conf/GENERIC_TINY:1.89 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/news68k/conf/GENERIC_TINY Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.89 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: GENERIC_TINY,v 1.90 2020/08/01 08:20:51 maxv 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.89 $"
+#ident "GENERIC_TINY-$Revision: 1.90 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -209,7 +209,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device vcoda # coda minicache <-> venus comm.
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
Index: src/sys/arch/newsmips/conf/GENERIC
diff -u src/sys/arch/newsmips/conf/GENERIC:1.138 src/sys/arch/newsmips/conf/GENERIC:1.139
--- src/sys/arch/newsmips/conf/GENERIC:1.138 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/newsmips/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.138 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC,v 1.139 2020/08/01 08:20:51 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmip
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.138 $"
+#ident "GENERIC-$Revision: 1.139 $"
maxusers 16
@@ -202,7 +202,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device vnd # disk-like interface to files
#options VND_COMPRESSION # compressed vnd(4)
Index: src/sys/arch/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.148 src/sys/arch/next68k/conf/GENERIC:1.149
--- src/sys/arch/next68k/conf/GENERIC:1.148 Fri Apr 26 21:40:31 2019
+++ src/sys/arch/next68k/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.148 2019/04/26 21:40:31 sevan Exp $
+# $NetBSD: GENERIC,v 1.149 2020/08/01 08:20:51 maxv 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.148 $"
+#ident "GENERIC-$Revision: 1.149 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -231,7 +231,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device wsmux # mouse & keyboard multiplexor
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.171 src/sys/arch/ofppc/conf/GENERIC:1.172
--- src/sys/arch/ofppc/conf/GENERIC:1.171 Sat May 16 13:46:11 2020
+++ src/sys/arch/ofppc/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.171 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: GENERIC,v 1.172 2020/08/01 08:20:51 maxv 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.171 $"
+#ident "GENERIC-$Revision: 1.172 $"
maxusers 32
@@ -430,7 +430,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
pseudo-device clockctl # user control of clock subsystem
Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.200 src/sys/arch/pmax/conf/GENERIC:1.201
--- src/sys/arch/pmax/conf/GENERIC:1.200 Mon Jan 20 18:38:21 2020
+++ src/sys/arch/pmax/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.200 2020/01/20 18:38:21 thorpej Exp $
+# $NetBSD: GENERIC,v 1.201 2020/08/01 08:20:51 maxv 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.200 $"
+#ident "GENERIC-$Revision: 1.201 $"
maxusers 64
@@ -279,7 +279,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device vnd # virtual disk ick
Index: src/sys/arch/pmax/conf/GENERIC64
diff -u src/sys/arch/pmax/conf/GENERIC64:1.33 src/sys/arch/pmax/conf/GENERIC64:1.34
--- src/sys/arch/pmax/conf/GENERIC64:1.33 Mon Jan 20 18:38:21 2020
+++ src/sys/arch/pmax/conf/GENERIC64 Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.33 2020/01/20 18:38:21 thorpej Exp $
+# $NetBSD: GENERIC64,v 1.34 2020/08/01 08:20:51 maxv 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.33 $"
+#ident "GENERIC-$Revision: 1.34 $"
maxusers 64
@@ -262,7 +262,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device vnd # virtual disk ick
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.192 src/sys/arch/prep/conf/GENERIC:1.193
--- src/sys/arch/prep/conf/GENERIC:1.192 Sat May 16 13:46:12 2020
+++ src/sys/arch/prep/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.192 2020/05/16 13:46:12 maya Exp $
+# $NetBSD: GENERIC,v 1.193 2020/08/01 08:20:51 maxv 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.192 $"
+#ident "GENERIC-$Revision: 1.193 $"
maxusers 32
@@ -543,7 +543,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/rs6000/conf/GENERIC
diff -u src/sys/arch/rs6000/conf/GENERIC:1.42 src/sys/arch/rs6000/conf/GENERIC:1.43
--- src/sys/arch/rs6000/conf/GENERIC:1.42 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/rs6000/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.42 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC,v 1.43 2020/08/01 08:20:51 maxv Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed con
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.42 $"
+#ident "GENERIC-$Revision: 1.43 $"
maxusers 32
@@ -230,7 +230,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#
# accept filters
Index: src/sys/arch/sandpoint/conf/ENCPP1
diff -u src/sys/arch/sandpoint/conf/ENCPP1:1.22 src/sys/arch/sandpoint/conf/ENCPP1:1.23
--- src/sys/arch/sandpoint/conf/ENCPP1:1.22 Sat Apr 13 08:23:00 2019
+++ src/sys/arch/sandpoint/conf/ENCPP1 Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ENCPP1,v 1.22 2019/04/13 08:23:00 isaki Exp $
+# $NetBSD: ENCPP1,v 1.23 2020/08/01 08:20:51 maxv Exp $
#
# Ampro EnCorePP1 machine description file
#
@@ -23,7 +23,7 @@ options PIC_I8259
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ENCPP1-$Revision: 1.22 $"
+#ident "ENCPP1-$Revision: 1.23 $"
maxusers 32
@@ -89,7 +89,6 @@ pseudo-device bpfilter # packet filter
pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device npf # NPF packet filter
pseudo-device loop
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.104 src/sys/arch/sandpoint/conf/GENERIC:1.105
--- src/sys/arch/sandpoint/conf/GENERIC:1.104 Wed Mar 25 17:06:19 2020
+++ src/sys/arch/sandpoint/conf/GENERIC Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.104 2020/03/25 17:06:19 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.105 2020/08/01 08:20:51 maxv Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.104 $"
+#ident "GENERIC-$Revision: 1.105 $"
maxusers 32
@@ -308,7 +308,6 @@ pseudo-device carp # Common Address Re
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/sandpoint/conf/SANDPOINT
diff -u src/sys/arch/sandpoint/conf/SANDPOINT:1.17 src/sys/arch/sandpoint/conf/SANDPOINT:1.18
--- src/sys/arch/sandpoint/conf/SANDPOINT:1.17 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/sandpoint/conf/SANDPOINT Sat Aug 1 08:20:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: SANDPOINT,v 1.17 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: SANDPOINT,v 1.18 2020/08/01 08:20:51 maxv Exp $
#
# Sandpoint X3/X2 machine description file
#
@@ -23,7 +23,7 @@ options PIC_I8259
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "SANDPOINT-$Revision: 1.17 $"
+#ident "SANDPOINT-$Revision: 1.18 $"
maxusers 32
@@ -91,7 +91,6 @@ pseudo-device bpfilter # packet filter
pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device npf # NPF packet filter
pseudo-device loop
Index: src/sys/arch/sbmips/conf/GENERIC
diff -u src/sys/arch/sbmips/conf/GENERIC:1.109 src/sys/arch/sbmips/conf/GENERIC:1.110
--- src/sys/arch/sbmips/conf/GENERIC:1.109 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/sbmips/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.109 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC,v 1.110 2020/08/01 08:20:52 maxv Exp $
include "arch/sbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.109 $"
+#ident "GENERIC-$Revision: 1.110 $"
#options LOCKDEBUG # XXX XXX XXX XXX
#options DEBUG # extra kernel debugging support
@@ -187,7 +187,6 @@ pseudo-device loop # network loopback
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
Index: src/sys/arch/sgimips/conf/GENERIC32_IP12
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP12:1.37 src/sys/arch/sgimips/conf/GENERIC32_IP12:1.38
--- src/sys/arch/sgimips/conf/GENERIC32_IP12:1.37 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/sgimips/conf/GENERIC32_IP12 Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.37 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC32_IP12,v 1.38 2020/08/01 08:20:52 maxv Exp $
#
# GENERIC32_IP12 machine description file
#
@@ -32,7 +32,7 @@ makeoptions TEXTADDR=0x80002000 # entry
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.37 $"
+#ident "GENERIC32-IP2x-$Revision: 1.38 $"
maxusers 32
@@ -232,7 +232,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
pseudo-device agr # IEEE 802.3ad link aggregation
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device accf_data # "dataready" accept filter
#pseudo-device accf_http # "httpready" accept filter
Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.118 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.119
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.118 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.118 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.119 2020/08/01 08:20:52 maxv Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.118 $"
+#ident "GENERIC32-IP2x-$Revision: 1.119 $"
maxusers 32
@@ -278,7 +278,6 @@ pseudo-device stf # 6to4 IPv6 over IPv
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
pseudo-device agr # IEEE 802.3ad link aggregation
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device accf_data # "dataready" accept filter
pseudo-device accf_http # "httpready" accept filter
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.130 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.131
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.130 Sat Jan 25 18:38:36 2020
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.130 2020/01/25 18:38:36 thorpej Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.131 2020/08/01 08:20:52 maxv Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entr
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.130 $"
+#ident "GENERIC32_IP3x-$Revision: 1.131 $"
maxusers 32
@@ -314,7 +314,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device accf_data # "dataready" accept filter
pseudo-device accf_http # "httpready" accept filter
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.268 src/sys/arch/sparc/conf/GENERIC:1.269
--- src/sys/arch/sparc/conf/GENERIC:1.268 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/sparc/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.268 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC,v 1.269 2020/08/01 08:20:52 maxv 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.268 $"
+#ident "GENERIC-$Revision: 1.269 $"
maxusers 32
@@ -588,7 +588,6 @@ pseudo-device vlan
## Simple inter-network traffic bridging
pseudo-device bridge
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
## accept filters
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.228 src/sys/arch/sparc64/conf/GENERIC:1.229
--- src/sys/arch/sparc64/conf/GENERIC:1.228 Wed May 13 10:33:16 2020
+++ src/sys/arch/sparc64/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.228 2020/05/13 10:33:16 martin Exp $
+# $NetBSD: GENERIC,v 1.229 2020/08/01 08:20:52 maxv 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.228 $"
+#ident "GENERIC-$Revision: 1.229 $"
maxusers 64
@@ -598,7 +598,6 @@ pseudo-device vlan
## Simple inter-network traffic bridging
pseudo-device bridge
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device npf # NPF packet filter
Index: src/sys/arch/sun2/conf/GENERIC
diff -u src/sys/arch/sun2/conf/GENERIC:1.105 src/sys/arch/sun2/conf/GENERIC:1.106
--- src/sys/arch/sun2/conf/GENERIC:1.105 Sun Mar 8 06:32:41 2020
+++ src/sys/arch/sun2/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.105 2020/03/08 06:32:41 rin Exp $
+# $NetBSD: GENERIC,v 1.106 2020/08/01 08:20:52 maxv Exp $
#
# GENERIC machine description file
#
@@ -29,7 +29,7 @@ options INSECURE # allow modload(8) in
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.105 $"
+#ident "GENERIC-$Revision: 1.106 $"
makeoptions COPTS="-Os -fno-inline-small-functions"
# bootloader has size limit (~2MB)
@@ -260,7 +260,6 @@ pseudo-device loop # network loopback
#pseudo-device bpfilter # packet filter
#pseudo-device carp # Common Address Redundancy Protocol
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device sl # CSLIP
#pseudo-device ppp # PPP
#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
Index: src/sys/arch/sun3/conf/DISKLESS
diff -u src/sys/arch/sun3/conf/DISKLESS:1.77 src/sys/arch/sun3/conf/DISKLESS:1.78
--- src/sys/arch/sun3/conf/DISKLESS:1.77 Fri Jun 19 10:35:11 2020
+++ src/sys/arch/sun3/conf/DISKLESS Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.77 2020/06/19 10:35:11 tsutsui Exp $
+# $NetBSD: DISKLESS,v 1.78 2020/08/01 08:20:52 maxv Exp $
# DISKLESS - Root and swap on NFS
# Desktop machines only (3/50, 3/60, 3/110)
@@ -157,7 +157,6 @@ pseudo-device ppp # PPP
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.182 src/sys/arch/sun3/conf/GENERIC:1.183
--- src/sys/arch/sun3/conf/GENERIC:1.182 Fri Jun 19 10:35:11 2020
+++ src/sys/arch/sun3/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.182 2020/06/19 10:35:11 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.183 2020/08/01 08:20:52 maxv 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.182 $"
+#ident "GENERIC-$Revision: 1.183 $"
makeoptions COPTS="-Os -fno-unwind-tables" # bootloader has size limit (~2MB)
@@ -265,7 +265,6 @@ pseudo-device ppp # PPP
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.135 src/sys/arch/sun3/conf/GENERIC3X:1.136
--- src/sys/arch/sun3/conf/GENERIC3X:1.135 Fri Jun 19 10:35:11 2020
+++ src/sys/arch/sun3/conf/GENERIC3X Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.135 2020/06/19 10:35:11 tsutsui Exp $
+# $NetBSD: GENERIC3X,v 1.136 2020/08/01 08:20:52 maxv 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.135 $"
+#ident "GENERIC3X-$Revision: 1.136 $"
makeoptions COPTS="-Os -fno-unwind-tables" # bootloader has size limit (~2MB)
@@ -252,7 +252,6 @@ pseudo-device ppp # PPP
pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
#pseudo-device agr # IEEE 802.3ad link aggregation
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device pty # pseudo-terminals
pseudo-device vnd # paging to files
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.212 src/sys/arch/vax/conf/GENERIC:1.213
--- src/sys/arch/vax/conf/GENERIC:1.212 Mon Jan 20 18:38:21 2020
+++ src/sys/arch/vax/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.212 2020/01/20 18:38:21 thorpej Exp $
+# $NetBSD: GENERIC,v 1.213 2020/08/01 08:20:52 maxv 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.212 $"
+#ident "GENERIC-$Revision: 1.213 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -300,7 +300,6 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device vnd
#options VND_COMPRESSION # compressed vnd(4)
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.30 src/sys/arch/vax/conf/VAX780:1.31
--- src/sys/arch/vax/conf/VAX780:1.30 Mon Jan 20 18:38:21 2020
+++ src/sys/arch/vax/conf/VAX780 Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.30 2020/01/20 18:38:21 thorpej Exp $
+# $NetBSD: VAX780,v 1.31 2020/08/01 08:20:52 maxv Exp $
#
# 11/780,750,730 machine description file
#
@@ -281,7 +281,6 @@ pseudo-device pty # pseudo-terminals
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
#pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device vnd
#options VND_COMPRESSION # compressed vnd(4)
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.199 src/sys/arch/x68k/conf/GENERIC:1.200
--- src/sys/arch/x68k/conf/GENERIC:1.199 Sat May 16 13:46:12 2020
+++ src/sys/arch/x68k/conf/GENERIC Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2020/05/16 13:46:12 maya Exp $
+# $NetBSD: GENERIC,v 1.200 2020/08/01 08:20:52 maxv 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.199 $"
+#ident "GENERIC-$Revision: 1.200 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -480,7 +480,6 @@ pseudo-device vlan
## Simple inter-network traffic bridging
pseudo-device bridge
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#### Other device configuration
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1273 src/sys/conf/files:1.1274
--- src/sys/conf/files:1.1273 Sat Jul 25 22:46:34 2020
+++ src/sys/conf/files Sat Aug 1 08:20:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1273 2020/07/25 22:46:34 riastradh Exp $
+# $NetBSD: files,v 1.1274 2020/08/01 08:20:52 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -278,7 +278,6 @@ obsolete defflag IPX # obsolete
obsolete defparam opt_md.h MEMORY_RBFLAGS # superseded by
# MEMORY_DISK_RBFLAGS
-defflag opt_bridge_ipf.h BRIDGE_IPF # bridge(4) use inet_pfil_hooks
defflag opt_ppp.h PPP_DEFLATE PPP_BSDCOMP PPP_FILTER
# Include deflate or bsd
# compression, enable pppd
