From nobody Thu Oct 29 06:57:12 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 4jFZm91Rdjz6xw2b for ; Thu, 29 Oct 2026 06:57:13 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFZm86Fb5z4HsG for ; Thu, 29 Oct 2026 06:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793257032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aetxs+vYtfdoJX+cXTB5sWOc4drDS+rIrWZ6SHYpqik=; b=WIPSG0xuh7FmPWsxJI0m0hiHe0cEX90nMls10uy/tczU33mQqffeJkHBdTQRPBtFDqq6s9 QJ/zqxi1m8LJjRvoGgWDb1EjtUufx1ZqcMceeQQsFoAufqc0cRCsZOogXjssk+D2XDl5Da 8inBwAnfx3qasTpohz9uCClkVLBjJNk2WoyJ/TQuxwaAxjBtV5rUMTEC/gVz4FogWwLOxE 7d/ywnsLIwpIVSEIRzo0RNC5kb6nUINt8LDYzQ+b2qxCfKwZYDy/HDigjeAGlhwusD5AW1 qxrajtOnZgI2CpDKiV4eWm9X4lkRIK3pMn1mLuG5O+PSQhiOjPPOeGxBBQlZxg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793257032; b=mGS2ZgNwa/NGwGgjLWLwRv9oCCntV77DrN3Z7JrN3S/zPOnnbPA5/VSgwaM2tttN3MSAOr 1zQwbNvZo/6CPf4zP2tqCpENkkAD6cAxWqjR5t/Jk6Z7+mOrNNdn9qg+ny2gqNBlI8PeIm ap8MV7tnQNWTrHAjuk4EYBUX5oCHHV9d/KWIU1r+M7q8+ZbcXb0zSudVp65IFHIjH5aGR7 xEb+5f9iE5fXcIC6Qf+su7tcoO9H9KRF41pLpiOZ+iWOeM2JYDJPZ7JNFlIbg6yL3hirL/ UQMeLpO8gwNbn4fTLgyfY4qqpTVHjaCXabsQ7U1QMr/f/ygxaOAWjo+DkYWZFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793257032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aetxs+vYtfdoJX+cXTB5sWOc4drDS+rIrWZ6SHYpqik=; b=PxKt5dGw/+7OcqvEkJPlXpSfaPZYVbkMqerkT3sBL9YBCwE63GnorhOdpZ2tyK19CrxuoO WTvNXokx6jlo2r/8iij4L09fyaLhg/nVDHuUHIrRX1Ol2nS0eETgd9qjThddFEah5EEvG2 D/aSxpV/kL5tpNFsqpEuy0tm+6i39SorBafcktLdvtky2ladRpwA7f2MNlRdcRiQds9fF5 8tx+erNtf5IGJek6/8V12qdxtx/tR/hTFJmDuRKnyjzVspyjRYmC300/CzKxLKK1WwbpRi NGnUrAYRhnR6Ckp5cQ6SHgLnz/EFFZQIeaIyNUICeVgidW7hHPzbANWmWkFVBw== 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 4jFZm849FhzSR6 for ; Thu, 29 Oct 2026 06:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dae2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:57:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cheng Cui From: Kevin Bowling Subject: git: 0c6468d6301f - stable/15 - em: remove M_HASHTYPE when RSS is not enabled List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0c6468d6301fe6920db71ade10645d0ff7999f69 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:57:12 +0000 Message-Id: <6ae2ee48.3dae2.6ccbd566@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0c6468d6301fe6920db71ade10645d0ff7999f69 commit 0c6468d6301fe6920db71ade10645d0ff7999f69 Author: Cheng Cui AuthorDate: 2026-02-05 21:12:15 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:54:44 +0000 em: remove M_HASHTYPE when RSS is not enabled Summary: Since "73fe85e486d2 tcp: store flowid info in syncache", inp_flowid can be set if the incoming packet is not M_HASHTYPE_NONE. But this can introduce dummy and duplicated flowid when a virtual interface set M_HASHTYPE_OPAQUE. This change will let the upper layer know how to deal with software hash, with benefits like inp_flowid can be set correctly and m_pkthdr.flowid can be set correctly in output path. This fix is similar to "20285cad7a55" Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D55137 (cherry picked from commit efcc0423d80e4048e11e997abc46bd0343537e1b) --- sys/dev/e1000/em_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index b2a877281e68..927dd9df8cb9 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -867,6 +867,6 @@ em_determine_rsstype(uint32_t pkt_info) case E1000_RXDADV_RSSTYPE_IPV6_UDP_EX: return M_HASHTYPE_RSS_UDP_IPV6_EX; default: - return M_HASHTYPE_OPAQUE; + return M_HASHTYPE_NONE; } }