Date: Fri, 24 Mar 2023 07:05:48 GMT From: Eric Joyner <erj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 949d971f0b69 - main - ice(4): Restore old conditional overwritten by last update Message-ID: <202303240705.32O75mo8023205@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=949d971f0b697f80db3087d74688a2ff0a12a359 commit 949d971f0b697f80db3087d74688a2ff0a12a359 Author: Eric Joyner <erj@FreeBSD.org> AuthorDate: 2023-03-24 07:01:01 +0000 Commit: Eric Joyner <erj@FreeBSD.org> 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 <erj@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303240705.32O75mo8023205>