From nobody Fri Mar 24 07:05:48 2023 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 4PjYC038fjz419yW; Fri, 24 Mar 2023 07:05:48 +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 4PjYC02Ccpz4F9R; Fri, 24 Mar 2023 07:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679641548; 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=2C/MhyzcVK2IdvYYX6FpuPXcUk/HF2y4U3Sm4ZwPfGE=; b=H1iPBXYtneqvaCdMNcLL/0yIa/3lLKvDTYcPaJhnTwLgNwqTgzoReBH/0zeEAPMWu2Wzw+ /v7DLC8Tf6wJFoPuPHbkRDOmIrXswNCDMsykF6OCoQoCXAbI0AspWSW2spsJ+/XN82AW9p RM34w2jHgrA7xcoA6Cm0kt/HgefoAtn9x9xo8YVmsxHcPgCJHPkUvygVEkOxKYZGmEXlvx +Xb+VjBemHFirgJqdpC6gtbypxZnU3QX5f/j39Uz6jnmwmb6YRQD8S+YfTZLTYI+Ye2xUm O1qtdwBwIYskHWiQBhasO7LKx6+grQ572KrMKPPAUzPAFhV9tUzpAIj2pRlaig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679641548; 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=2C/MhyzcVK2IdvYYX6FpuPXcUk/HF2y4U3Sm4ZwPfGE=; b=efQHdDMO9YHPYoPbiicnmKcNLEnBnjqruaK9psWMZbpH7kR9WzTNJ3oY/N2bRwfT2Oyikd flt1BY9BzJMY51DKU8lBNBPXPmxDlUAXEHs5WSRmVM+XP90VH3jm63pUHbYoJ8Qgye85ap i/WxwtF6Kz0BCmrLJ2Ohz3IWAGiVjwwkQjNV2Zm3xDY25WJIhE5x7gNX8FInM4ZqrTE/a6 QQ0V7rvsQmHJmt8jVa36AoUsSn551J9z4Mjnk9ZZgwUh1S60SLiH7WiELrwopg4KjuCe1n wJYOQhuMMnMD0apkWvrKx4Wr0gjrHs9gw45r7mzGcw9ErqAPre2heTeV7zF/wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679641548; a=rsa-sha256; cv=none; b=Wnsy0PnwDyiijj6zoWc1xHvONuSXg6sfqMqxNtOahX7TmLmdx+ukWYDAuc9pLbgWfRctP0 Laa5kWbSfOzDwRu4IUNBtZf+v21JEkgTVWtKvox9MYZ5nUcgmT5hzTtNxQMe3ojZYSWb3i NjJ061qgwW6ZpsisRoJo4yRJWMhkDr6IWGKNgr8IwxexkxM1Cl8n9XaUaLd8srDLPsO/6I 7dHYc6aTcv1ACcJPjggnpUKhjtXa1LLfZnlBp+bWw76IGRYbR/ywGLZ2hxTKpEiPzZ7GWe CHUGTJ6tfHXzqRjXs8y+PW1Hv9BfKMZxsUy3B1k4KGvg8sGqg3uSwY+/BKaUTA== 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 4PjYC01BN5z17pG; Fri, 24 Mar 2023 07:05:48 +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 32O75mco023206; Fri, 24 Mar 2023 07:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O75mo8023205; Fri, 24 Mar 2023 07:05:48 GMT (envelope-from git) Date: Fri, 24 Mar 2023 07:05:48 GMT Message-Id: <202303240705.32O75mo8023205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 949d971f0b69 - main - ice(4): Restore old conditional overwritten by last update 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 949d971f0b697f80db3087d74688a2ff0a12a359 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=949d971f0b697f80db3087d74688a2ff0a12a359 commit 949d971f0b697f80db3087d74688a2ff0a12a359 Author: Eric Joyner AuthorDate: 2023-03-24 07:01:01 +0000 Commit: Eric Joyner CommitDate: 2023-03-24 07:05:26 +0000 ice(4): Restore old conditional overwritten by last update Commit 8923de590543 ("ice(4): Update to 1.37.7-k", 2023-02-13) unintentionally overwrote the change made in commit 52f45d8acee9 ("net: iflib: let the drivers use isc_capenable", 2021-12-28). Signed-off-by: Eric Joyner Reported by: jhibbits@ MFC after: 3 days Sponsored by: Intel Corporation --- sys/dev/ice/ice_iflib_txrx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index 89c85357a755..9c60f36db665 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -284,6 +284,7 @@ static int ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) { struct ice_softc *sc = (struct ice_softc *)arg; + if_softc_ctx_t scctx = sc->scctx; struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[ri->iri_qsidx]; union ice_32b_rx_flex_desc *cur; u16 status0, plen, ptype; @@ -341,7 +342,7 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) /* Get packet type and set checksum flags */ ptype = le16toh(cur->wb.ptype_flex_flags0) & ICE_RX_FLEX_DESC_PTYPE_M; - if ((iflib_get_ifp(sc->ctx)->if_capenable & IFCAP_RXCSUM) != 0) + if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0) ice_rx_checksum(rxq, &ri->iri_csum_flags, &ri->iri_csum_data, status0, ptype);