Date: Wed, 7 May 2025 19:15:11 GMT From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a2070ebfaf04 - stable/14 - bridge: define VLANTAGOF correctly Message-ID: <202505071915.547JFBV4027687@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a2070ebfaf0461ec57f78abe2704dc014a74e552 commit a2070ebfaf0461ec57f78abe2704dc014a74e552 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2025-04-04 15:05:01 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505071915.547JFBV4027687>