From nobody Thu Apr 10 18:53:36 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 4ZYTVT4HXBz5tLmR; Thu, 10 Apr 2025 18:53:37 +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 4ZYTVT0TVkz3hhg; Thu, 10 Apr 2025 18:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744311217; 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=vEM3PkdXd/V/t/pRKnjUMW8M/emg7O9WkpgHELRfl1c=; b=fA06Ed6OKWu2hKG8eRqapOqmZEO349C54q3y7lXaFnB46eQT98CSqQ3oWl98e/JI+FxQzY 52bXLfJlqBZcLiXFyXvgSFbv02onlp8ja4LTB8b2qrDHzyD4a+Q6SsFRsz6/lV7Yp363BD cWj3MDwTjUXyE25dCt7o39jJvhf4GRs6wB5y5lZPnyVEgFQZvtNodcAcXXdRkoQioQP0/G y1piLLt5CYovWurZlBhH/VU8hCGorUpErQBQ4f6TudihTIJvbqjCfQIl17beV/K+XLWFZT NTXX/4Ov4Uplka8l5s20M5KY/z4l4s1RUKfsXT3EeJrYWclAdjrCsXOsPXTEDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744311217; a=rsa-sha256; cv=none; b=v2jjAhR6tVK6ildyT0c/VTa6BLv0Vbf6Gqq9/k7LyqgYgTy5tt4XGnvwWS0iZ06Wkrj7bp LYTDjzx74bSXTN/D8nTQ8qRE0Q5hhxFdnH2Y8f8YOnn3rh2wmNINnzR7wJ76Spsfvm+k4F YRKT8q8hHL9CoAZzNskcaPq0vmUkXptS9tSH/C5vRxHARVr0hK1UGJJWpHLdqMmUdL9hH/ eM2wvOgWlduJvzfRoN9exscMsSHb1COsF4SLvP3nXsEIe4fLgQVaEBqOUf8nC1f8HvpPt3 j3njT37rwiMG6Ej2zGlxLy4r7PTWbrYpKthdVtmFKaVOCymvNS4wF8mOtuZYgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744311217; 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=vEM3PkdXd/V/t/pRKnjUMW8M/emg7O9WkpgHELRfl1c=; b=yeoVcbAO1ItjJ/FcNLloZ+ozM4nCgXKhdvOC3cmEU9ltFFKdacRTR5/PxuH9oJqi9MzQus V/a0nDGGihHNeY718JdZ/1naCxpS7NlzmmJaQRskxspxZiR0aaJovIZNkgwiS2QGsjdWwd taJ1VCqiLH0URnS9cvuS3ZqHBzEiQVoJpqLkbEhfCQW8htQTqYrFn9KA5/LGgaXaMHQ9Bh lNNcfsOWxEovuzUGdVDgV6eeV/BOVRIFOK+WM/9fN+hjTav/vD00SuUcF+C+7Csc1zn5jY jQLyJ29K7Iakku/M/4SwkFQexVoiQH6BVPOJhPejolCZihpj41hrjZl1FCqKoQ== 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 4ZYTVS6wNzz1DnK; Thu, 10 Apr 2025 18:53:36 +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 53AIraAq005099; Thu, 10 Apr 2025 18:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53AIraH4005096; Thu, 10 Apr 2025 18:53:36 GMT (envelope-from git) Date: Thu, 10 Apr 2025 18:53:36 GMT Message-Id: <202504101853.53AIraH4005096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f36292f010fc - main - 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f36292f010fcc6391605182f2973fdc12a3bd15f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f36292f010fcc6391605182f2973fdc12a3bd15f commit f36292f010fcc6391605182f2973fdc12a3bd15f Author: Lexi Winter AuthorDate: 2025-04-04 15:05:01 +0000 Commit: Kristof Provost CommitDate: 2025-04-10 16:51:50 +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 --- 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 fdfec024ef07..0dd261e6529b 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -424,7 +424,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,