From nobody Fri Jul 4 23:22:34 2025 X-Original-To: dev-commits-src-main@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 4bYqRb4VdDz618sW; Fri, 04 Jul 2025 23:22:35 +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 4bYqRb0Z7Nz49Xy; Fri, 04 Jul 2025 23:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751671355; 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=gegiNBM2C1pWqveMRttNACwLu2hWWaxHWa5U2s872U4=; b=A5xSwEFJQD5cuJ44GsCJJe0d0VPOSM9qvH3NZ3ZMm+cPj0RMIGVufKiF5DSV0ZhA34af0w +O0ojQD2vuW7iTnajL7moL5nCtE1zGKIPzUlUeeA0dCiczIp1KKrjqUrvFKJD5PTgoEv5t SEdTHdjd7j5cWeKQLqvAn8duShZZ7n5lgJHreg3uMM80+oXeKve0866IZ5/U29HPRkjWvi rehPVXDNlmgVrTRPAQK5vUU/cY0JdinNut50Z6MuepVpk8gkra3ZX8RH/ssMRj23DTY+qm qzbeshNCBtXoHvYJ68wq7VHma4jqLUYl96Vz8ZApPCX4cIFCgPFtgAj4azc/eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751671355; 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=gegiNBM2C1pWqveMRttNACwLu2hWWaxHWa5U2s872U4=; b=iUNB9MF1SkRXSEv3Z8GYhd+VWqQrgJe7IQusFbAQWMelKRl/xLCzL+tFQqzVs6dunebsRl sxiMcK8Cw5HXYt0QKexWuROxJYJXuw3vTsIAw8oCG8U+ATFQJHJ8IK8KI8UVkD1l6/8usP DTcgvaZnQfpX+QpgVHIyknWd9RGVYMxMl59yZLzkw0/vWJe8hlaYUn7RFuTuVSdYCUaMLs 5c6UErnZ/wNN/zKGY7qFhxQz7Eu9Te+HdG1XIfu2SNbJhLTS1i3rfmlzkINcDFrwYULYhC wgyWIbVRSqhB0mb+ReNa8xQNkKFfXUrJxGdNLDE+a+pSP4vm64W/WKUz5nuy/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751671355; a=rsa-sha256; cv=none; b=llHy4nLqrDVrUxJehSjEbqgDCGFNoA86xFpRzOaDwt1ZfsCOSA3JKKOB7NXCzohVf4uhM/ oRSAed9ZijKPXBthFqeioqgJMpiF4UvscLPktxf4u2/UDbRyfFnSQG0BmGUsSVpE5zb25i 8KWr4qHDdEEJ2NQYapb/Qjqwt+DLZMeUAMNKzW2Xvm26R/ruhB78834rwHBA0//wm+bS0s mKOOSkWCiyvFQJn8Q2PusYCPN/ad3T6IzM8LXK5EPwGMF9acbMyw+n6W34gIYlqIvARg2X PDwz9i9p8h2KGDkaAtmUxge/9C34tnwudD+bRb602Y3Vb7+aldOUweaJPg7abA== 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 4bYqRZ73Hpz19Bh; Fri, 04 Jul 2025 23:22:34 +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 564NMYjM034709; Fri, 4 Jul 2025 23:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564NMY4w034706; Fri, 4 Jul 2025 23:22:34 GMT (envelope-from git) Date: Fri, 4 Jul 2025 23:22:34 GMT Message-Id: <202507042322.564NMY4w034706@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: 533c0d345b93 - main - sys/net: move DOT1Q_VID_* constants to ethernet.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 533c0d345b93ecf6832c9f689f5401c3fb182229 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=533c0d345b93ecf6832c9f689f5401c3fb182229 commit 533c0d345b93ecf6832c9f689f5401c3fb182229 Author: Lexi Winter AuthorDate: 2025-07-02 01:19:34 +0000 Commit: Lexi Winter CommitDate: 2025-07-04 23:21:51 +0000 sys/net: move DOT1Q_VID_* constants to ethernet.h These are generally useful to anything dealing with 802.1q and aren't specific to if_vlan, so move them to and remove the _KERNEL gate. While here, document what they actually mean. Reviewed by: kp, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50570 --- sys/net/ethernet.h | 17 +++++++++++++++++ sys/net/if_vlan_var.h | 7 ------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 6eefedba8775..cf4f75bd0b6c 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -80,6 +80,23 @@ struct ether_addr { (((addr)[0] | (addr)[1] | (addr)[2] | \ (addr)[3] | (addr)[4] | (addr)[5]) == 0x00) +/* + * 802.1q VID constants from IEEE 802.1Q-2014, table 9-2. + */ + +/* Null VID: The tag contains only PCP (priority) and DEI information. */ +#define DOT1Q_VID_NULL 0x0 +/* The default PVID for a bridge port. NB: bridge(4) does not honor this. */ +#define DOT1Q_VID_DEF_PVID 0x1 +/* The default SR_PVID for SRP Stream related traffic. */ +#define DOT1Q_VID_DEF_SR_PVID 0x2 +/* A VID reserved for implementation use, not permitted on the wire. */ +#define DOT1Q_VID_RSVD_IMPL 0xfff +/* The lowest valid VID. */ +#define DOT1Q_VID_MIN 0x1 +/* The highest valid VID. */ +#define DOT1Q_VID_MAX 0xffe + /* * This is the type of the VLAN ID inside the tag, not the tag itself. */ diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index f0b09445d04b..695bb81f77b3 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -126,13 +126,6 @@ struct vlanreq { #define VLAN_PCP_MAX 7 -#define DOT1Q_VID_NULL 0x0 -#define DOT1Q_VID_DEF_PVID 0x1 -#define DOT1Q_VID_DEF_SR_PVID 0x2 -#define DOT1Q_VID_RSVD_IMPL 0xfff -#define DOT1Q_VID_MIN 1 /* minimum valid vlan id */ -#define DOT1Q_VID_MAX 4094 /* maximum valid vlan id */ - /* * 802.1q full tag. Proto and vid are stored in host byte order. */