From nobody Wed May 07 19:16:23 2025 X-Original-To: dev-commits-src-branches@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 4Zt4kH5BHfz5v8WQ; Wed, 07 May 2025 19:16:23 +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 4Zt4kH2z9Qz44xH; Wed, 07 May 2025 19:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645383; 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=QMS6wzCz9VnU622t/W/8OfJfvUhTESZWHkpweKP2K+Q=; b=f15EfCSQSdJ2uJUpAnpL7WHlFu+5Eibmvu6+GDhc9wGGGASI+pMKfL7Y1STAz93e47aTG3 msmtrrb0ID8foi1LtwI3z7PaKqlpvSm3DfYjj9tOaRxf+xhmGWQ32RIggijw4t9OsV7tVf l7vtMCtchtTvyw4OQvaBCOveMIK9HiB/1QCr8DgjfNLyTFO4iC8tDFFUvaW/8VuanMct4B 33e82WegFUVQDNHPrJp7XZ0Jlm67Bmzn7/mr+QeVzyDuL98jjxg7lHrj0K2bubwG512XJE ufYCrrHBNvw+CqdNxmwqUg24uqAMCXfMnUppNar6kwmTqGOgzXoPElJMfic69g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746645383; 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=QMS6wzCz9VnU622t/W/8OfJfvUhTESZWHkpweKP2K+Q=; b=GjsDc2OJ6l6lFrfnentKcazbYQwpoyqrCJab08PH5WUuWQDuQAk/Nh/WUY3hYIE/ohCXnV w3xTFn5BmQQO5qxP3XVBcs7lAgiIvie+0lLPK4x5nh1/01mdFqlitm+v0Jt6J2E4H6Kh2z laGK0UmFhuNd9FGGUPD/ozSQN4KLW4RgxmU3+UBcDzGYrF6BMXcChMK2lTKxiTqYKwpg/X kaQkC4wLSV2+uuXI3UF6vYkw7taGKxKE2iZFBX67WldOdEDPZ3UHqnSRuhLrfAEq2MJl2X CqeKrdNlOu6bG/KO5AYRuhWtMCCoBXibI8UzBaIDHzZ/bb5DE6sLaaNdinUevA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746645383; a=rsa-sha256; cv=none; b=fvziH8XeFn58YRGVW2Bh6o4D43apC44A8R8hcBZqzlCxeiUeovR3QhNYUQu1Uvcuo3g4S0 9Y21AnRbBFjXvLk+c0osMqC4dI0RV4wZ1Hz9KSUaYaMdA8bCwT/7Y5ZiRfHxtAAsD7lpIC FJj7ru0CDnJdWyRbRGLIh/HxyPcrt4VC+C63WLYAIPThcqwU8VC4/3Pk8zOmueGx66aI78 1fw0hvmBHep/NHKtJwxHyrgSEkV8XaHpmr21h9Yig0jjrmwaIPtKB1AuRvZFjEYiNK3xsV JzyywbH1q8NXUOlwRTSMYGkUltghlLWDZ5GuRQZEFCTXzG4EzJE3VEOUt9u7PQ== 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 4Zt4kH2VgLzjDX; Wed, 07 May 2025 19:16:23 +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 547JGNw7028156; Wed, 7 May 2025 19:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547JGNel028153; Wed, 7 May 2025 19:16:23 GMT (envelope-from git) Date: Wed, 7 May 2025 19:16:23 GMT Message-Id: <202505071916.547JGNel028153@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: a13702f04aff - stable/13 - bridge: define VLANTAGOF correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: a13702f04affcafb98840553599f7a5267adc791 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a13702f04affcafb98840553599f7a5267adc791 commit a13702f04affcafb98840553599f7a5267adc791 Author: Lexi Winter AuthorDate: 2025-04-04 15:05:01 +0000 Commit: Lexi Winter CommitDate: 2025-05-07 19:09:59 +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 b392a9c69a7f..dd506d558c99 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -420,7 +420,7 @@ static void bridge_linkcheck(struct bridge_softc *sc); /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ #define VLANTAGOF(_m) \ - (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1 + ((_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1) static struct bstp_cb_ops bridge_ops = { .bcb_state = bridge_state_change,