From nobody Wed May 7 19:15:11 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 4Zt4hw053hz5v8j6; Wed, 07 May 2025 19:15:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt4hv5qyWz43hD; Wed, 07 May 2025 19:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645311; 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=aFrUIHJwSkzBV9mOtiwU6RpEjGoEOyloI5Vh2IdMgIY=; b=y0BtPun98mTgNVqz490HxKV0sUwoh7eWuaENIGB0LQcPj0YXKGlTR2m+NfV3WrMOPdT+i5 z4rpusbr3vC9PphwdlcCfRfyAFle4oUKAbm2FdvYQJo+W5KkD5X9Rp30ScFUw4r+yt+vUq 6gXT4f3+Ldda5QcjwMm5x3woJtDD3Pl6bsqh+vr9gWacHbl4LNKd5mQNhMUwUnnVYD/u5h 48WfTdgfDVi5YKLKYtgGNajtJpzr8G82dOMP/o8IfZAp8HbKxTYW1jba/ntMwkHA5IAC8g +8VL+QE/lIQHquhJw4EyFrrWm0ymJFKV1PdagNAjSSaIvvhQSHNKaU8DWpmsjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645311; 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=aFrUIHJwSkzBV9mOtiwU6RpEjGoEOyloI5Vh2IdMgIY=; b=STOQXyGIpMk66BLgRxKCny4jj91AxEMkbls3KN4X1Z4ry4xZGJVM2ud07OLWKlXlzqPlTe UtEylwHS6EPNqP2sEvKPr1ByNhqujICX7TiN23dfQ9BPCgrH5WYXnnX/zv5c6JNZMf+YYR tKvYdOqFrZHiUXI2VvCLi07fgq98Jy8L8Ki3+dTCmAjP0NnQQfNpyzGFp20xOfKONuKvwb dmQ8G7XvMMbYC2IwNOxSp5TAemyaY0kDHOkm2n8+FZFhV+e7kd57XR2Au2NRqyn1jHWmRH sTaILyOEhukCtgcvlYWCak3FOZ9Kk4WK204X/NrVZ/DOem/dN4mIVuW54NTiog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746645311; a=rsa-sha256; cv=none; b=bi8W8p8Q6wzp+9dlJZmLiWpwnSDv0ThXJRENUBJGEgHWZZmUYRcGhGm1NYhZxX5NZgKxZD KGNjn4OKbopP1mNIbb/Ay8lhEcF+jsv8Iy51Gx04dj2s5u6lvASgS5+y8YAifeIbZnrMw2 JpBte8qmRCRNHZfrgG7v4Xxzz49NJAGcDWd1mjEkJSbMQap432rAiqIBMb/uvJL/lhc0jv wnGx2TIxdii+XTmXI25c4bUKRgfIYNPLKafIpdcli16+VqXyiApXw9Qgk5mBBdnNvn3S9Y P9V7nTDl/q+qVPFdwSMKMszUPQ2F4m2CEDPoq+qWzpOBeIDRDVhSc4ZwEkl+qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt4hv598YzjRp; Wed, 07 May 2025 19:15:11 +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 547JFBDJ027690; Wed, 7 May 2025 19:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547JFBV4027687; Wed, 7 May 2025 19:15:11 GMT (envelope-from git) Date: Wed, 7 May 2025 19:15:11 GMT Message-Id: <202505071915.547JFBV4027687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a2070ebfaf04 - stable/14 - bridge: define VLANTAGOF correctly 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a2070ebfaf0461ec57f78abe2704dc014a74e552 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a2070ebfaf0461ec57f78abe2704dc014a74e552 commit a2070ebfaf0461ec57f78abe2704dc014a74e552 Author: Lexi Winter AuthorDate: 2025-04-04 15:05:01 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:07:51 +0000 bridge: define VLANTAGOF correctly to avoid strange precedence errors, enclose the macro body in parentheses. this fixes constructs like: if (VLANTAGOF(m) == i) Reviewed by: kp (cherry picked from commit f36292f010fcc6391605182f2973fdc12a3bd15f) --- sys/net/if_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 5cb4a033e325..79561bc4c9cd 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -419,7 +419,7 @@ static void bridge_linkcheck(struct bridge_softc *sc); * to indicate untagged frames. */ #define VLANTAGOF(_m) \ - (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : DOT1Q_VID_NULL + ((_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : DOT1Q_VID_NULL) static struct bstp_cb_ops bridge_ops = { .bcb_state = bridge_state_change,