From nobody Sun Apr 26 07:52:12 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 4g3JnY6DNYz6bBvC for ; Sun, 26 Apr 2026 07:52:17 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3JnS5155z422R for ; Sun, 26 Apr 2026 07:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777189932; 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=+v4fhlqATbRPRm29QXb/fnVJRE3OE7CWomtYTlwPgAQ=; b=s82f2lF3WvG6JacdofvxL46pLS6MTnalaJI5lj6BVPheN6aPApz869dUi4LHj4GrwlpDc+ ujZQKlZ49zyVU0vvWgHMapFgZ9STy6WOyi129Ynts/s6mpK2QoTnb7fq3CWaG8esjHYntU W31mhUzMhJni8ncQfZFvj1opN5z/EPLMm2lLv593Q+7HIxqK9e4F5+tqf+s48wdBtVds1v FiUJXi+T6WxHrY2K0p5YsBx1fxH3zqXNKRBwZVN4agQp0w+yzmMqEuODxGpgRv/RBCN8DX TSKCcINAkYlLWdl8ZCa5GEYNtg420hiBaanGa0xNLqtyAjZqxQqYSPpkYSN+9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777189932; a=rsa-sha256; cv=none; b=F+xY4u6K+NTvzEeJrPfKYo5K8Rl8QVIkF1HeodxarvvwnSEcrNrQqSNH7NNAW0NAU1BLOM 7rj6mpBgDBTwjaL+k2pqjvipHMLJfCVQ1RJa2qIxAwrM+bnPRglLlLIV+FZgajwZdUWL0+ +s5oBcqTKzqUAd57PjpCPTN31T7aU6GXxvGGEikunfMCHJirf7NniXDmHZ1GgzoL0YcvMi jVsvP2mVniQBMlSyvI4/hWrCuq3HogzvjS6zNtFozOwZe1H/jXtmqSLtPBCSLRkdXKVQBR urMCmIHwdZrpvgjmDVHFljVbX0gwP0Iw5+g97xh3VgDlR0Wd0aN8JTBaJDlGRQ== 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=1777189932; 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=+v4fhlqATbRPRm29QXb/fnVJRE3OE7CWomtYTlwPgAQ=; b=c+TPwiG7Prd3HGjD9lTesyt52UbR3neXldfFxdpVueETR8ykyc2OrtZROaERaJnLhkuMz2 PzljQH072a5Rxw6OFDW9JTrbmhPtnNA7xuWmh4UqQ1jSgdRE35WQuKhbg+qRqKSEP8EbVh v8cCLWR3WBcDoZH+hQbvBBKJQ0Z01VRc5qYODcZRJkopiBeU3sbidjIjzArIlkq3Xn3T53 D8qfa1oplB4GtAt2M3zYzS9jL8IkKYYNGqV0WNhGmfhDFUSqFpbi3JosMDnLmozxzbcAhL OCxSjUfG79/89j/fTeTtt+eE/tzYhnJzlrKvpqE0Phfm7QtB19vRghFIUCvR9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3JnS4WGSz19kd for ; Sun, 26 Apr 2026 07:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25d41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 07:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f2d2ce09fd95 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f2d2ce09fd957fd6a2502ea9db784e053b268865 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 07:52:12 +0000 Message-Id: <69edc42c.25d41.75731ba1@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f2d2ce09fd957fd6a2502ea9db784e053b268865 commit f2d2ce09fd957fd6a2502ea9db784e053b268865 Author: Michael Tuexen AuthorDate: 2026-02-10 17:08:07 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:50: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 Differential Revision: https://reviews.freebsd.org/D55188 Event: Wiesbaden Hackathon 2026 (cherry picked from commit 378577393e407fa2cd9677392da2287e37b4dd33) --- 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; } /*