From nobody Sun Aug 10 15:37:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c0MMh1X6xz649wj; Sun, 10 Aug 2025 15:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c0MMg3fDLz3f67; Sun, 10 Aug 2025 15:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oxqfQMhswdbPLp5j7cJp0TrNwl8yuzdp/75MCPtAEGA=; b=t3XZGkiVOV5bqVvD4ISNkmnQddNvMtm+m9OcbtkF0q2rbvj5+j7LR64VaMpZEX4mXeyFOF RknFWn61Ty2/5CSWSx3HvzE/NgL9QrI+lfPSBlWXyQZGbdF8SDBAErF4z1QMjTj8IHtY5B WUxNjBNdklCImQ73IAaCxbyg4bMip9+ZWROGUGN0umgTMujejWNMz/wpcfKD7/2EJMwDoT L1lhYp1QwsTw1uHBSgQcEsTROnkKT0DmjRY/kATqeXOHSHgO2AlhK+qhhJ6dROSTmvGZv/ s3P8RLVF6ZbmU7ig+YSUZjb3yZ3buD/srSfdCflgy20ezX96vkfRVJZrbOc8Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oxqfQMhswdbPLp5j7cJp0TrNwl8yuzdp/75MCPtAEGA=; b=DkGJiiBb3a5eQXAujnuS15o/vn2bfUyWOwLSUApHyFsenPoKr5H4fV3qAnzs5uO7g0Ha86 LQ3ZepGQgDXWiCO8cZPz5iG9eKoUZ1aMuPQYgant6bTVD2v+pyBJZwCBJ8Boq2Kk92De9B iLseoT1ZOhaqW/ioYzowj6NZMQDOYPDiAHULP42Qa7VmHzwNYcDWSkz123pPiuloiAJaEA tDb5ReXbRdJq4qEn5sPfVKj8vEYAZy1mUlDsmguwD3SmIyYOX02TNmBRbotLVXECxJUujb HmFvMoDgAws2m6xYp0ew0iX/fJkPxiXs0jnCM5x7haYeU07VANgnIOKBIx67+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754840239; a=rsa-sha256; cv=none; b=G9oYko3pleCPyCF6hPdHrvk9f853Y0a1SMlhi9hTK2Mt1FvRbhtSK96NY6MsDtnxS/epZf nvsmBbiRo2RMfxOsdmCCOsN4FK+8vgcLB777Rf0Om8tojB98nJ4L7ouZyt31ClvXVoEr98 2a3EOg/HtpCDjxQCFLYuFFDT5ZiagIL1ZzFwaW4tYjJeaEbL39kSUufym14pmxza3hAexL LoYea75GN2Z2veYVMszQTr51PBbKvpPYlpVR5rFCWPCNSYRxWASRF8udJGcGdPWH/2DAzQ 3pgPg943eX2oNMdQeN8xgTQtTcrywO339udfMpDI0EbrD/YQ+LBecSp/Z2Bbgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c0MMg2zJ8z19r8; Sun, 10 Aug 2025 15:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57AFbJUQ067283; Sun, 10 Aug 2025 15:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57AFbJ2L067280; Sun, 10 Aug 2025 15:37:19 GMT (envelope-from git) Date: Sun, 10 Aug 2025 15:37:19 GMT Message-Id: <202508101537.57AFbJ2L067280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 6856b8f4e6d9 - main - ifconfig.8: Remove VLAN filtering section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6856b8f4e6d992d021f24d1c5188e092be21b585 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=6856b8f4e6d992d021f24d1c5188e092be21b585 commit 6856b8f4e6d992d021f24d1c5188e092be21b585 Author: Lexi Winter AuthorDate: 2025-08-10 15:12:23 +0000 Commit: Lexi Winter 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