The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6856b8f4e6d992d021f24d1c5188e092be21b585
commit 6856b8f4e6d992d021f24d1c5188e092be21b585
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-08-10 15:12:23 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-10 15:36:40 +0000
ifconfig.8: Remove VLAN filtering section
Move the options from the VLAN filtering section into the main bridge
section. Some of these (e.g., ifuntagged and ifvlanproto) don't
specifically require VLAN filtering, and it would be confusing to
have only some of the vlan-related options in a separate section.
Differential Revision: https://reviews.freebsd.org/D51758
---
sbin/ifconfig/ifconfig.8 | 68 ++++++++++++++++++++++++++++++++----------------
1 file changed, 46 insertions(+), 22 deletions(-)
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index b562f9e4c0c5..b580191383b3 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 5, 2025
+.Dd August 10, 2025
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -2718,30 +2718,17 @@ Set the maximum number of hosts allowed from an
interface, packets with unknown
source addresses are dropped until an existing host cache entry expires or is
removed.
Set to 0 to disable.
-.El
-.Ss Bridge VLAN Filtering Parameters
-The behaviour of these options is described in the
-.Dq VLAN SUPPORT
-section of
-.Xr bridge 4 .
-.Bl -tag -width indent
.It Cm vlanfilter
Enable VLAN filtering on the bridge.
+Incoming frames on member interfaces will be dropped unless the frame
+is explicitly permitted by the interface's
+.Cm ifuntagged
+or
+.Cm iftagged
+configuration.
.It Cm -vlanfilter
Disable VLAN filtering on the bridge.
This is the default.
-.It Cm ifuntagged Ar interface Ar vlan-id
-Set the untagged VLAN identifier for an interface.
-.It Cm -ifuntagged Ar interface Ar vlan-id
-Clear the untagged VLAN identifier for an interface.
-.It Cm defuntagged Ar vlan-id
-Enable the
-.Cm untagged
-option by default on newly added members.
-.It Cm -defuntagged
-Do not enable the
-.Cm untagged
-option by default on newly added members.
.It Cm iftagged Ar interface Ar vlan-list
Set the interface's VLAN access list to the provided list of VLANs.
The list should be a comma-separated list of one or more VLAN IDs
@@ -2753,24 +2740,61 @@ meaning the empty set,
or the value
.Dq all
meaning all VLANs (1-4094).
+.Pp
+This option is only meaningful if the
+.Cm vlanfilter
+option is enabled for the bridge;
+otherwise, all VLANs will be permitted.
.It Cm +iftagged Ar interface Ar vlan-list
Add the provided list of VLAN IDs to the interface's VLAN access list.
The list should be formatted as described for
.Cm iftagged .
+.Pp
+This option is only meaningful if the
+.Cm vlanfilter
+option is enabled for the bridge;
+otherwise, all VLANs will be permitted.
.It Cm -iftagged Ar interface Ar vlan-list
Remove the provided list of VLAN IDs from the interface's VLAN access
list.
The list should be formatted as described for
.Cm iftagged .
+.Pp
+This option is only meaningful if the
+.Cm vlanfilter
+option is enabled for the bridge;
+otherwise, all VLANs will be permitted.
+.It Cm ifuntagged Ar interface Ar vlan-id
+Set the untagged VLAN identifier for an interface.
+Frames received on this interface without an 802.1Q tag will be assigned
+to this VLAN instead of the default VLAN 0,
+and outgoing frames on this VLAN will have their 802.1Q tag removed.
+.It Cm -ifuntagged Ar interface Ar vlan-id
+Clear the untagged VLAN identifier for an interface.
+.It Cm defuntagged Ar vlan-id
+Enable the
+.Cm untagged
+option by default on newly added members.
+.It Cm -defuntagged
+Do not enable the
+.Cm untagged
+option by default on newly added members.
+This is the default.
.It Cm qinq Ar interface
Allow this interface to send 802.1ad
.Dq Q-in-Q
frames.
+This option is only meaningful if the
+.Cm vlanfilter
+option is enabled for the bridge;
+otherwise, Q-in-Q frames are always allowed.
.It Cm -qinq Ar interface
Do not allow this interface to send 802.1ad
.Dq Q-in-Q
frames.
-This is the default behavior.
+This is the default if the
+.Cm vlanfilter
+option is enabled.
.It Cm defqinq
Enable the
.Cm qinq
@@ -2779,7 +2803,7 @@ option by default on newly added members.
Do not enable the
.Cm qinq
option by default on newly added members.
-This is the default behavior.
+This is the default.
.It Cm ifvlanproto Ar interface Ar proto
Set the VLAN encapsulation protocol on
.Ar interface
