From nobody Sat Dec 18 12:07:43 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 BB85D18F427E; Sat, 18 Dec 2021 12:07:43 +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 4JGPk72KFYz3CTZ; Sat, 18 Dec 2021 12:07:43 +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 300F47047; Sat, 18 Dec 2021 12:07:43 +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 1BIC7hb5040472; Sat, 18 Dec 2021 12:07:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BIC7hdK040471; Sat, 18 Dec 2021 12:07:43 GMT (envelope-from git) Date: Sat, 18 Dec 2021 12:07:43 GMT Message-Id: <202112181207.1BIC7hdK040471@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: 56eeb84f1093 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 56eeb84f1093a81ff9e103b09dcd12983609d1de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639829263; 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=LupqScF3mBzZxejaRpB8zTdP4Z+cCmTD1CX2n2E4u7c=; b=UhAeEBSKrZl7sxSr2HD2+NJJON2DkQuxCf5bhyMaFmc4+CZ4TbEUjmWs4lVveyjr+7NOvn Jo04DvWZmKvbGUuBuaroGXieSSGnViFYEt2KvG3Q/7NHDqQ1n82PHplbbQryzgvMJzjSQs vgtF8alj9295Rn89gqkHsLwr1SHQa0lHL3Y4DbEhGOYmtW1M5HACcHEzBIpjdAIye/0z7Z i4e0kx/EAMcVQRUDwuHCs12q4PUxeWp1nnQGUXW++SiIee6z/+37BJASnU/qZJAof3zfBs kHx3MovgY3ebf6hNRfztrmhFnhwmJQpUcXsrCuz0k0XFg638xOiGZGgz1q3mvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639829263; a=rsa-sha256; cv=none; b=BDmRblfz2rY1GpD38/2uG6UjR94SW18c2NExeV3WBZaJQHl2U5vZut2wuk6/pup9HargFS JaedNcAXxTo/maxTFduxKq1EFcsIfNVOgUdcbF5OP8zYUwibQz15hXJOskrFt1Igok8SKZ rChJgy/AuoxOfvWtxzWbtZTpn6TLrkSt47SHPthnf2h09Bs21e0Bj8nDMTlWphGgXIQJSB lZ4aR0rZldfZlL+ckZm6moHTVb1HYq9MrA+8HUDpi41eqgVe2w2vZcNwOVpHVnodW8BhtC 2hbWnkD4Fd17HCXMs262KgIGGAX8zUs4N9l+Ts8V3hW26P0xWkFxpCRAlxDmNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=56eeb84f1093a81ff9e103b09dcd12983609d1de commit 56eeb84f1093a81ff9e103b09dcd12983609d1de Author: Vincenzo Maffione AuthorDate: 2021-12-01 21:10:46 +0000 Commit: Vincenzo Maffione CommitDate: 2021-12-18 12:00:25 +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);