From nobody Sun Nov 30 15:56:39 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 4dKBVH2Pl9z6Hmmw for ; Sun, 30 Nov 2025 15:56:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKBVH0hMBz3CR5 for ; Sun, 30 Nov 2025 15:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764518199; 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=q5+0B32o0F7IFhNpDn2JxMpfKY5E+WC74SDNuNs0CDc=; b=eZbKU5KkFMh+etd1v4RClz1h1NZRKcqhugkTTg392dKs6X63EYnahzcX4vavHyIdFjNcsG YSa7YVolfFgw/KOn611xQZx87mwOCfbjy3Xe/hyXHnGx60nX/oTAoyTd7Y+Z9ERWr60D+L FrWP31MQ7BPOBx3nWA/18fAaGxycZ4ASTy9pnfsqDLK5Gx6P6V1X3SFNXZfYAX6IB/EJls xik7F/rjfbeZTl2rplAD5CvwBZkLeN2UX7m0MDAEnrYl4Po4yh1nXD2E7dJ1CVHdix/OIp OFFFuZZCeJY3ZyVbW/34Rwsw5dKyfJb35cBctUAiBBMvEMJwVX9546OwPFacKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764518199; 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=q5+0B32o0F7IFhNpDn2JxMpfKY5E+WC74SDNuNs0CDc=; b=XPb+FeFbvtmztN1R6HPHNSQIVjWQRx2iL+X8ZM8XLoYK0z5AR4Uuq9yzoYfaDTpmG3rqq2 GYMxwZC7v/hJDuq4jR53FO08jZsKZGHei+WY309DUt5FJ30OykfIQNPllBSYE9ms9Wy17r l1uTWSDWQKdkW09rY0Aowk7I9Xem7SNXRHXi4nFXd5jvKA+UGAk9sJs1J43yJkYu2PnmoR 5s58nntXsie4ibDq2tC0Q7AmwEBBopoD1tp4vDjiQKAaS+F3mnWPkcBWWXO28TOf5jtLQj 6A5X8SYO1Ffx52E1AtQLCo4Ggzew6goGRrywt0XNYFlBENLx9oHEtVupfu0k3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764518199; a=rsa-sha256; cv=none; b=pXOdKbipBSKFpa3Urqb3ob4Ezo8yJ+vE1+uOFuA0XKqdVNm7RoulmmECx176jrbMWHtajN QmgmBEWAzjZaOG9lCY3qZ/Ybxi6wi6aixKefw/YVfeh9NZrOEqe6hVPrYkkkKKXHagoL/c mzZB+IGY+liuR4axik+nbDwsTARxb92f0knIHOfJ8I98FXh9wGzfk7GRChkH/DVzUrENZO zaJSETSEMMPzTuOPrLXQX2ZgyMLTi6/DmstGi1/yjLa1vqV3iQWUUVfMAqs4/C8QT/H0Ir Qneq777HfoUG+d/o1NKroELmM+OvR2aQ50ozUrEyseZYxOIT7BNo6w4Nwoj9jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKBVH0BBPzhTq for ; Sun, 30 Nov 2025 15:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Nov 2025 15:56:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8666fda1afb0 - main - aq(4): Fix VLAN tag test 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8666fda1afb03b3a88e57a20d76da8e7910b6407 Auto-Submitted: auto-generated Date: Sun, 30 Nov 2025 15:56:39 +0000 Message-Id: <692c6937.38e4d.382f8d99@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8666fda1afb03b3a88e57a20d76da8e7910b6407 commit 8666fda1afb03b3a88e57a20d76da8e7910b6407 Author: Ed Maste AuthorDate: 2025-11-13 14:15:38 +0000 Commit: Ed Maste CommitDate: 2025-11-30 15:56:13 +0000 aq(4): Fix VLAN tag test Previously emitted a compiler warning "warning: bitwise comparison always evaluates to false." Looking at the OpenBSD driver (which is based on this code) it looks like the VLAN flag should be set if either of these bits is. In the OpenBSD driver these are AQ_RXDESC_TYPE_VLAN and AQ_RXDESC_TYPE_VLAN2 rather than a magic number 0x60. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53836 --- sys/dev/aq/aq_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/aq/aq_ring.c b/sys/dev/aq/aq_ring.c index e20527b8c7c2..ca0391a6d61b 100644 --- a/sys/dev/aq/aq_ring.c +++ b/sys/dev/aq/aq_ring.c @@ -361,7 +361,7 @@ static int aq_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) ri->iri_frags[i].irf_idx = cidx; ri->iri_frags[i].irf_len = len; - if ((rx_desc->wb.pkt_type & 0x60) == 1) { + if ((rx_desc->wb.pkt_type & 0x60) != 0) { ri->iri_flags |= M_VLANTAG; ri->iri_vtag = le32toh(rx_desc->wb.vlan); }