From nobody Fri Jul 24 16:01:21 2026 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 4h6CQp69Mzz6mLbN for ; Fri, 24 Jul 2026 16:01:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6CQp16qFz3bGC for ; Fri, 24 Jul 2026 16:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784908882; 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=aIIsGQfG6NyY49+UNiJ+yETVZE0WbnGbzKOWbXA0h6k=; b=otCnMeI0nordc+X2XL/nFXNlbRBeSoW7bBbgw0C1Awwo0oV+pEzuspN3+ctjZm3CguDQUZ aRYTuxSgN/pU6G4ojCRP3e8pe0nwyk5ZKldHCllZS6UOLoiWCg5778C6AVIb/9hw1iJtwf YcCjfU5wToUwrjqAjYUPQB5YKEfCmtpVgnAG7nSxxNfKzzeFE6LJYVJpcL1m6vRjjcvKdC Ojev1Uy4SzMIYcOHDaYqcJVJHh2swmPHgo5kp3NDb6iGXBxSE04/USwy6SlXomAcrfn1Hg NeCzfNsyoikGLH03P9k12mDutogdXRIAuzlEwKT9TXt2Rn4D8cFrR27IkwD+8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784908882; a=rsa-sha256; cv=none; b=FOoV11oHrtu1TnqDZqzAAJqFPWtdsY8cyThFXOeWpH6rQ1NBgqPsaYDRKLQpnAytqLXLUo RvGbsfYdmgkJ+UngZ6PLhRAyCarMNBOcHl22ktaeQKBJ19ig0lgwFvv12+KCjz5ijZ5ijC jQ1QLculfAlvdWSYpS548jHO3o4Htw0Ss17AUjcm2x6icGLMjN16ggUL4fVTYE5980pxcZ iyqnrW2Tm9PZrbhXRZq+vU5B8EpoiOxg3ZicIDKQ26NfYdMod8InyZTfiNyP7kBhJnWrmI 2PNNXT4MkKAS5vfbhcJ87tK34pooakJT5Rkji9bp4yApGKAz3qlGYUU5JvYahA== 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=1784908882; 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=aIIsGQfG6NyY49+UNiJ+yETVZE0WbnGbzKOWbXA0h6k=; b=e/6q+XI6u91CZrPpBAvCoS4692kkXmjH8+YgjVFpxn+zGW+zJHIqVTCfecQNUqvGuHRR5Y w069UyWz5yVdzWP3CMChqObP47G1p0lbZdFGGgs6eYaEgU/5I9IZxzQ3BhkOfLAw1NCftl 8bROxZOkdunRV5n/Q9lnXo67w8R+1Twp2TVjsv1llSQBL32qDisJfksvjURYgRLYY8bV9N /Ckg/E2EpBRZ6VhdlwTSb+ncMta+ls9g/BRqZ49cbJDo7cVcmDfKNHKwfNtqCalUhvAv19 1N2cf07wfYSJFJuLZEVOS2cs2jsPhMffUYfIqtO+My/UAgTMtoqGj+SBNm9nQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6CQn6mJLzxxB for ; Fri, 24 Jul 2026 16:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c696 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 16:01:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1fecb10f9428 - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1fecb10f94284b38702aafcc243d0c3dce5c286a Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 16:01:21 +0000 Message-Id: <6a638c51.3c696.5390c77f@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1fecb10f94284b38702aafcc243d0c3dce5c286a commit 1fecb10f94284b38702aafcc243d0c3dce5c286a Author: Ed Maste AuthorDate: 2025-11-13 14:15:38 +0000 Commit: Ed Maste CommitDate: 2026-07-24 16:00:18 +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 (cherry picked from commit 8666fda1afb03b3a88e57a20d76da8e7910b6407) --- 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); }