From nobody Tue Feb 10 17:13:58 2026 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 4f9SpG5cWYz6RdrT for ; Tue, 10 Feb 2026 17:13:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9SpG52wLz3ZWR for ; Tue, 10 Feb 2026 17:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770743638; 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=R1im8pfANff7KmTXggYZwWaY3OANBmO8cENbAaBIgq4=; b=AEnBXrI0mXOdZLO0FIWjUKTGG2PPSRmQspaw/96LMR1VTa8Us6h02nUsllUD2v9hdgVD1y rzIUpY7FQnb0yVyDlaUk9bUycChfdrOGmLL9KBvr/XTesQwd5BJ6ZWeVoEnPENSSqinJpp kohMWlaxIT4KqksIO7WcF3fQUujk20709py7Chp5T/OQIZw0mlS+OC4bpWF5LeP8KNTjU0 ON7OXK7Q2JZ77vDDJY6u7YNzHsLnwgvsyb54cKt21pOOy11EzZEyg2Zg1txg9DZYuhZvjs pDZCJK+P3jgaYPMkHDPlLkIQD1U3nrn2JnLf3PC+mfHqATbterSobcoQwvc6UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770743638; a=rsa-sha256; cv=none; b=T0Zn78Z4g9BHLHI5l82l3aPEc88yC8rNVCLPCTH05s03x7cuZURsNEhR2jhs4wx3Myk9Bo wWmoZORpuAWNRbkP/nxXDR3uPycnpbMP6cUTEZL9E4ZqVEYx8EVRCCb4dsfN8RWUrXy6kI vMd09GSCqpbPoqjGXRR4iINDW6swU/1n9MY+qs+9jKr6LKinhZUHk3DQWeUw7tbQ3q3Pth Dx/W+ErfOSJoqgEqYn/vwui9dfdFgtHKsPmWp+QcRnpwjKmDkpDzYFoQBOc8drP63uooTI xTS1srDjxz2afrwkl0NgbSoxv4obrd4VIy+AW1RCyTQoeEgUsRznYg4RW2ZKGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770743638; 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=R1im8pfANff7KmTXggYZwWaY3OANBmO8cENbAaBIgq4=; b=TK1fsC9p//XAjxOERElJOTHUeZdlwMNGrfedPhWF/sXUgInf1cfP6I8vTOeaCZtWlTvHs+ rd+wd44O4zgg1IfwvVSiA36A4vzxw3ztUL0GN3QKBmzpAP/Yuu5lvmdsPOjnCzkrLSaWMi gZq/x7PgEIu2MqYpuA6YpwifVTeRGi8kAtPeH+wt2zGymTt3Th4wxaToHgEAwLdoiLPh2v eI4GlsLSU5Dw/B7TC1oKYWol/MsbRoOivmg7tilqVTx14Q+YjeiY5QJ0ctuy32gGQtcvZk cS5dQTIPElseEpYXn4YVtnMT+YGzmoRWafo6hGuMD6tEKH5Za1yOWuOJAxvbig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9SpG4dWhz1RNv for ; Tue, 10 Feb 2026 17:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 17:13:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 378577393e40 - main - ure: improve receive checksum offloading 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 378577393e407fa2cd9677392da2287e37b4dd33 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 17:13:58 +0000 Message-Id: <698b6756.1fe70.6a0f73b1@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=378577393e407fa2cd9677392da2287e37b4dd33 commit 378577393e407fa2cd9677392da2287e37b4dd33 Author: Michael Tuexen AuthorDate: 2026-02-10 17:08:07 +0000 Commit: Michael Tuexen CommitDate: 2026-02-10 17:13:48 +0000 ure: improve receive checksum offloading Let the receive checksum offload for TCP/IPv6 and UDP/IPv6 be controlled by ifconfig rxcsum6 and not by ifconfig rxcsum. While there, make the code more compact and improve stlye.9 conformity. Reviewed by: Timo Völker MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55188 --- sys/dev/usb/net/if_ure.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index 92160fe9b1d2..257051e6e379 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -2131,41 +2131,33 @@ ure_rtl8152_nic_reset(struct ure_softc *sc) static void ure_rxcsum(int capenb, struct ure_rxpkt *rp, struct mbuf *m) { - int flags; uint32_t csum, misc; - int tcp, udp; m->m_pkthdr.csum_flags = 0; - if (!(capenb & IFCAP_RXCSUM)) - return; - csum = le32toh(rp->ure_csum); misc = le32toh(rp->ure_misc); - tcp = udp = 0; - - flags = 0; - if (csum & URE_RXPKT_IPV4_CS) - flags |= CSUM_IP_CHECKED; - else if (csum & URE_RXPKT_IPV6_CS) - flags = 0; - - tcp = rp->ure_csum & URE_RXPKT_TCP_CS; - udp = rp->ure_csum & URE_RXPKT_UDP_CS; + if ((capenb & IFCAP_RXCSUM) == 0 && + (csum & URE_RXPKT_IPV4_CS) != 0) + return; + if ((capenb & IFCAP_RXCSUM_IPV6) == 0 && + (csum & URE_RXPKT_IPV6_CS) != 0) + return; - if (__predict_true((flags & CSUM_IP_CHECKED) && - !(misc & URE_RXPKT_IP_F))) { - flags |= CSUM_IP_VALID; + if ((csum & URE_RXPKT_IPV4_CS) != 0) { + m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED; + if (__predict_true((misc & URE_RXPKT_IP_F) == 0)) + m->m_pkthdr.csum_flags |= CSUM_IP_VALID; } if (__predict_true( - (tcp && !(misc & URE_RXPKT_TCP_F)) || - (udp && !(misc & URE_RXPKT_UDP_F)))) { - flags |= CSUM_DATA_VALID|CSUM_PSEUDO_HDR; + ((rp->ure_csum & URE_RXPKT_TCP_CS) != 0 && + (misc & URE_RXPKT_TCP_F) == 0) || + ((rp->ure_csum & URE_RXPKT_UDP_CS) != 0 && + (misc & URE_RXPKT_UDP_F) == 0))) { + m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; m->m_pkthdr.csum_data = 0xFFFF; } - - m->m_pkthdr.csum_flags = flags; } /*