From nobody Wed Dec 22 13:44:49 2021 X-Original-To: dev-commits-src-branches@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 B3EA118E473A; Wed, 22 Dec 2021 13:44:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJvhK6ztgz4WfX; Wed, 22 Dec 2021 13:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CF5CB1E072; Wed, 22 Dec 2021 13:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMDinY8087708; Wed, 22 Dec 2021 13:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMDinRi087707; Wed, 22 Dec 2021 13:44:49 GMT (envelope-from git) Date: Wed, 22 Dec 2021 13:44:49 GMT Message-Id: <202112221344.1BMDinRi087707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: 5a26132b28b6 - stable/12 - em: skip rxcsum offload processing when disabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5a26132b28b66ec49fac6089c469c5aa04680f00 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640180690; 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=jgCxD7hqglzySSXxWz8z84y85/Pk9XFb1z9DHpO1+fA=; b=UWQHiplv2hQYO5+fcExrPyGz/mPYyXzsOOB5P+C014sWUAN2qQNtCKryTbn+KvE+FCyRiv VS0hlJrQ+97IU1xrH0C3fYUhcadtOAOSfnEV99UWxlivMBDoeeZIX70Zm61pJkKuIdKj62 lWNIARRcx++1xfRmVtb26Q0zx6yzA+ndNkGMIvldTJTgaoymNUCwOOht0Yk8K7mPDcHVwJ ytCIKH3Oq6iHapCtlPCshMaP1lhpCWBTskUHt+iKSOEYpdhC9wasFm7HtWfKQN6NSrv4wX p6ubGHc6wCGAXOzA8thQMVVz0QFDVaasgoloxN8ttcnPUrIOfNXnE78sFKQnow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640180690; a=rsa-sha256; cv=none; b=OXgCoElDA5tbV1J/J0H4yoafoseuzNoxhQ3vgbewS+L9nmCiVSGAhTiHut0FSv/+6q5NBE mjnXXJR8wLIM9zgGXtXUkQ0U0bN15k6fDfoUjoo0OCWZBCVHiw78N1Paa9WxV9efROEGg0 kNT5eAdRTcyQ/yCpHU0hIRQrpRTwU44BZ521elwKpEN8iTBTRHaDU9WvJ9c8fl+XCGx8t1 IvnWnjv56tJGX1wdSeuYNQOPYolfHpK0bbGkLPyyeEaUZzpjW/0XVey/zdxgulZQ3WaasQ ZxytAEG2tLncS21l8bq0KXGrBh6HV6NdBW6HLK5qjh/G/8Ey7Btmg06k9omMUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=5a26132b28b66ec49fac6089c469c5aa04680f00 commit 5a26132b28b66ec49fac6089c469c5aa04680f00 Author: Vincenzo Maffione AuthorDate: 2021-12-01 21:10:46 +0000 Commit: Vincenzo Maffione CommitDate: 2021-12-22 13:44:39 +0000 em: skip rxcsum offload processing when disabled Similarly to the other Intel drivers, don't try to process RX checksum offloads when this feature (IFCAP_RXCSUM) is disabled. Reviewed by: gallatin, kbowling, erj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33155 (cherry picked from commit d0633af7658fe02bc1af8639ef6dbb0d029c1b65) --- sys/dev/e1000/em_txrx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 6ac66a9011f4..1f1c13c9a099 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -706,7 +706,8 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) i++; } while (!eop); - em_receive_checksum(staterr, staterr >> 24, ri); + if (if_getcapenable(ri->iri_ifp) & IFCAP_RXCSUM) + em_receive_checksum(staterr, staterr >> 24, ri); if (staterr & E1000_RXD_STAT_VP) { vtag = le16toh(rxd->wb.upper.vlan);