From nobody Wed Dec 01 21:13:02 2021 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 C357118CBDB7; Wed, 1 Dec 2021 21:13:02 +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 4J4BdB3L3Mz3DCj; Wed, 1 Dec 2021 21:13:02 +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 53BAB1129E; Wed, 1 Dec 2021 21:13:02 +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 1B1LD2gZ046858; Wed, 1 Dec 2021 21:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B1LD2Rk046857; Wed, 1 Dec 2021 21:13:02 GMT (envelope-from git) Date: Wed, 1 Dec 2021 21:13:02 GMT Message-Id: <202112012113.1B1LD2Rk046857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: d0633af7658f - main - em: skip rxcsum offload processing when disabled 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d0633af7658fe02bc1af8639ef6dbb0d029c1b65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638393182; 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=vpYwzKF0JrbZNhOgnZZR9ZQPIYVQhWYLuJ2ALG9aiCY=; b=BCxbMxYrikNucojhAUp4iApe1MXPNC0QsygLG17WC4nfJcbsnKKOfuKhwGhsfKTqQeEeP+ AZgPNm4BJf5QzZ6qQv9U6OoxYqq8Yd/GquyHyNKGf9/95FD8yeJtcsFTbSEMsKvsho20+K 0U6Kn+uT34nf/S1vT8Vgk5OVRga2kxvvzHmdKo4yBs8MBR5be97cIo3xpSo2WB85tqm3gr sZPGxxLwObfhNyHD3oYMQUFwDyHZqvD73sCv74VaSe3dsTiK31MybPq6MNxcOFZ3mWDgDY NXbG/ih7pvWbKq53XD61ZNCPQz/3dkX5Lc+6c9pokb9yEVqXHyuvpvECnqfN7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638393182; a=rsa-sha256; cv=none; b=TjbvMIRBrAvDor0/1eyEfo5dj0slNL2WuT/DbCa0QZu3rEImpDEE+2rm63ZEJENZy46ZEd 05KnGIaCvljGb5AepQTNhoT9dmCNNxS/0NMdmYyqOxpRGnHXvBkuj22qluSATttHJnsWCZ 2MgE4SWT30Bh/4pbq1gyJWHjb7l19TQvNuxBcyfrIgpYplRBLZljpQWMj1bu8FdVjiqExn hPdjVYkLTd4bWK7c1RjZlzyqLr6ZjiDHfCKUneXX6BnnwTOhrxMlNmy+fKxmGJsBFd80C2 rhhMiI/BUHIAOr2f7m6OBn5V5JRhcQr0yBHyjN9h9u9UPlmjuy4TAYTVDczlZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=d0633af7658fe02bc1af8639ef6dbb0d029c1b65 commit d0633af7658fe02bc1af8639ef6dbb0d029c1b65 Author: Vincenzo Maffione AuthorDate: 2021-12-01 21:10:46 +0000 Commit: Vincenzo Maffione CommitDate: 2021-12-01 21:10:46 +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 --- 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);