Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove references to BRIDGE_IPF, it is now compiled in by de...



details:   https://anonhg.NetBSD.org/src/rev/24349c6f2111
branches:  trunk
changeset: 1012498:24349c6f2111
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Aug 01 08:20:47 2020 +0000

description:
Remove references to BRIDGE_IPF, it is now compiled in by default.

diffstat:

 doc/TODO.smpnet                       |   3 +--
 share/man/man4/bridge.4               |   8 ++------
 share/man/man4/options.4              |  11 ++---------
 sys/arch/acorn32/conf/EB7500ATX       |   5 ++---
 sys/arch/acorn32/conf/GENERIC         |   5 ++---
 sys/arch/alpha/conf/GENERIC           |   5 ++---
 sys/arch/amd64/conf/ALL               |   5 ++---
 sys/arch/amd64/conf/GENERIC           |   5 ++---
 sys/arch/amd64/conf/XEN3_DOM0         |   5 ++---
 sys/arch/amd64/conf/XEN3_DOMU         |   5 ++---
 sys/arch/amiga/conf/DRACO             |   5 ++---
 sys/arch/amiga/conf/GENERIC           |   5 ++---
 sys/arch/amiga/conf/GENERIC.in        |   5 ++---
 sys/arch/amiga/conf/INSTALL           |   5 ++---
 sys/arch/amigappc/conf/GENERIC        |   5 ++---
 sys/arch/amigappc/conf/NULL           |   5 ++---
 sys/arch/arc/conf/GENERIC             |   5 ++---
 sys/arch/bebox/conf/GENERIC           |   5 ++---
 sys/arch/cats/conf/GENERIC            |   3 +--
 sys/arch/cesfic/conf/GENERIC          |   3 +--
 sys/arch/cobalt/conf/GENERIC          |   5 ++---
 sys/arch/cobalt/conf/INSTALL          |   5 ++---
 sys/arch/dreamcast/conf/G1IDE         |   3 +--
 sys/arch/dreamcast/conf/GENERIC       |   3 +--
 sys/arch/emips/conf/GENERIC           |   5 ++---
 sys/arch/evbarm/conf/ARMADILLO210     |   3 +--
 sys/arch/evbarm/conf/ARMADILLO9       |   3 +--
 sys/arch/evbarm/conf/CUBOX            |   3 +--
 sys/arch/evbarm/conf/DUOVERO          |   3 +--
 sys/arch/evbarm/conf/GUMSTIX          |   3 +--
 sys/arch/evbarm/conf/HDL_G            |   3 +--
 sys/arch/evbarm/conf/HPT5325          |   3 +--
 sys/arch/evbarm/conf/IYONIX           |   5 ++---
 sys/arch/evbarm/conf/MARVELL_NAS      |   3 +--
 sys/arch/evbarm/conf/MINI2440         |   3 +--
 sys/arch/evbarm/conf/MMNET_GENERIC    |   5 ++---
 sys/arch/evbarm/conf/MPCSA_GENERIC    |   5 ++---
 sys/arch/evbarm/conf/MV2120           |   3 +--
 sys/arch/evbarm/conf/OPENBLOCKS_A6    |   3 +--
 sys/arch/evbarm/conf/OPENBLOCKS_AX3   |   3 +--
 sys/arch/evbarm/conf/PEPPER           |   3 +--
 sys/arch/evbarm/conf/SHEEVAPLUG       |   3 +--
 sys/arch/evbarm/conf/SMDK2410         |   3 +--
 sys/arch/evbarm/conf/SMDK2800         |   3 +--
 sys/arch/evbarm/conf/TWINTAIL         |   3 +--
 sys/arch/evbmips/conf/GDIUM           |   5 ++---
 sys/arch/evbmips/conf/LINKITSMART7688 |   3 +--
 sys/arch/evbmips/conf/LOONGSON        |   5 ++---
 sys/arch/evbmips/conf/SBMIPS          |   5 ++---
 sys/arch/evbppc/conf/EXPLORA451       |   3 +--
 sys/arch/evbppc/conf/OPENBLOCKS266    |   5 ++---
 sys/arch/evbppc/conf/OPENBLOCKS600    |   5 ++---
 sys/arch/evbsh3/conf/NEXTVOD          |   5 ++---
 sys/arch/ews4800mips/conf/GENERIC     |   5 ++---
 sys/arch/hp300/conf/GENERIC           |   5 ++---
 sys/arch/hpcmips/conf/GENERIC         |   5 ++---
 sys/arch/hppa/conf/GENERIC            |   5 ++---
 sys/arch/i386/conf/ALL                |   5 ++---
 sys/arch/i386/conf/GENERIC            |   5 ++---
 sys/arch/i386/conf/XEN3PAE_DOM0       |   3 +--
 sys/arch/i386/conf/XEN3PAE_DOMU       |   3 +--
 sys/arch/ia64/conf/GENERIC.SKI        |   5 ++---
 sys/arch/iyonix/conf/GENERIC          |   5 ++---
 sys/arch/landisk/conf/GENERIC         |   5 ++---
 sys/arch/luna68k/conf/GENERIC         |   5 ++---
 sys/arch/luna68k/conf/INSTALL         |   3 +--
 sys/arch/mac68k/conf/GENERIC          |   5 ++---
 sys/arch/macppc/conf/GENERIC          |   5 ++---
 sys/arch/macppc/conf/GENERIC_601      |   5 ++---
 sys/arch/mipsco/conf/GENERIC          |   3 +--
 sys/arch/mmeye/conf/GENERIC           |   5 ++---
 sys/arch/mmeye/conf/MMEYE_WLF         |   5 ++---
 sys/arch/mvme68k/conf/GENERIC         |   5 ++---
 sys/arch/netwinder/conf/GENERIC       |   3 +--
 sys/arch/news68k/conf/GENERIC         |   5 ++---
 sys/arch/news68k/conf/GENERIC_TINY    |   5 ++---
 sys/arch/newsmips/conf/GENERIC        |   5 ++---
 sys/arch/next68k/conf/GENERIC         |   5 ++---
 sys/arch/ofppc/conf/GENERIC           |   5 ++---
 sys/arch/pmax/conf/GENERIC            |   5 ++---
 sys/arch/pmax/conf/GENERIC64          |   5 ++---
 sys/arch/prep/conf/GENERIC            |   5 ++---
 sys/arch/rs6000/conf/GENERIC          |   5 ++---
 sys/arch/sandpoint/conf/ENCPP1        |   5 ++---
 sys/arch/sandpoint/conf/GENERIC       |   5 ++---
 sys/arch/sandpoint/conf/SANDPOINT     |   5 ++---
 sys/arch/sbmips/conf/GENERIC          |   5 ++---
 sys/arch/sgimips/conf/GENERIC32_IP12  |   5 ++---
 sys/arch/sgimips/conf/GENERIC32_IP2x  |   5 ++---
 sys/arch/sgimips/conf/GENERIC32_IP3x  |   5 ++---
 sys/arch/sparc/conf/GENERIC           |   5 ++---
 sys/arch/sparc64/conf/GENERIC         |   5 ++---
 sys/arch/sun2/conf/GENERIC            |   5 ++---
 sys/arch/sun3/conf/DISKLESS           |   3 +--
 sys/arch/sun3/conf/GENERIC            |   5 ++---
 sys/arch/sun3/conf/GENERIC3X          |   5 ++---
 sys/arch/vax/conf/GENERIC             |   5 ++---
 sys/arch/vax/conf/VAX780              |   3 +--
 sys/arch/x68k/conf/GENERIC            |   5 ++---
 sys/conf/files                        |   3 +--
 100 files changed, 168 insertions(+), 277 deletions(-)

diffs (truncated from 2319 to 300 lines):

diff -r f7a8fc58a6a4 -r 24349c6f2111 doc/TODO.smpnet
--- a/doc/TODO.smpnet   Sat Aug 01 08:18:36 2020 +0000
+++ b/doc/TODO.smpnet   Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
    - Ethernet (if_ethersubr.c)
    - bridge(4)
      - STP
-     - BRIDGE_IPF
    - Fast forward (ipflow)
  - Layer 3
    - All except for items in the below section
diff -r f7a8fc58a6a4 -r 24349c6f2111 share/man/man4/bridge.4
--- a/share/man/man4/bridge.4   Sat Aug 01 08:18:36 2020 +0000
+++ b/share/man/man4/bridge.4   Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 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.
diff -r f7a8fc58a6a4 -r 24349c6f2111 share/man/man4/options.4
--- a/share/man/man4/options.4  Sat Aug 01 08:18:36 2020 +0000
+++ b/share/man/man4/options.4  Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 .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.
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX   Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX   Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 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  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
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 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  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
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 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  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
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/amd64/conf/ALL   Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 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  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
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 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  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
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Aug 01 08:20:47 2020 +0000
@@ -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       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  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
 
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Sat Aug 01 08:20:47 2020 +0000
@@ -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       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  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
 
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/amiga/conf/DRACO
--- a/sys/arch/amiga/conf/DRACO Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/amiga/conf/DRACO Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 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  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
diff -r f7a8fc58a6a4 -r 24349c6f2111 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Sat Aug 01 08:18:36 2020 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Sat Aug 01 08:20:47 2020 +0000
@@ -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 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.327 $"



Home | Main Index | Thread Index | Old Index