From nobody Sun Apr 26 08:32:00 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 4g3KgP0Zhnz6bFtM for ; Sun, 26 Apr 2026 08:32:01 +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 4g3KgN6hhVz4DFR for ; Sun, 26 Apr 2026 08:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777192321; 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=eO+M4S+4ZOF+uVAycBErr2nQwntcG+AS0gFWTTZ5czc=; b=dklDjjgxz8roXI7hg0Bv8Wb9DdUX8x7UQ1+8pnjkvCjbeAyvaTNWQLPaqWXy8j4yIJnY9j 6ovczd+rrdcToVP+Ks+XcOvnonsmYxDJmTmYRuq8eA+zc0JV+BUjpOk4KilTE5lebtQ4KR kW1EBWMTVu60u796vPdFY5L+scyARcuPy8bMd05O6u4L0SbC2YDzvvFuClOBsoLSGBss0q py1CRY2haS0EyHXDsPp5L5tz32yngz7JoJFStir7vLyN9So37DpD//GYLRIbghAkPNGqXY oyvP4t9VN2sqEH7i0xQLUHsIc/gMT6YWoSjGOA9LHlSpbk5gT8SsqFKnic3u1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777192321; a=rsa-sha256; cv=none; b=PO7GWWp/bTYgytCfM27SUNEz6i1WF6X+7n+U9GjjgvWx23CXcbIlaV4/jpb+MDS7U6KzgM k7udP3u4C0T+QFI1yALcPTjVbxLUJBa3g/kWHeFoQfFJuvcAUqaWH/iZU5yddjHDa0HmtT crBT1JXhxvSZgbfUVp6885FUwXfEPsdNuGkxNPuTiRisIoTnp6iWDB1FKm1wH4ENl1n9w2 VmK+icYcCEHQHlf64PxDTZmDvhAG5MOJv+PTg/H1qKrlWyIemEPkjyrK3MKTQy5kLfnrte 8TIhBIm/jTX4zOozud/saJkR0MIs1ctl6VGB+YYfb02Xp346WGgqrQGGU5gosg== 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=1777192321; 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=eO+M4S+4ZOF+uVAycBErr2nQwntcG+AS0gFWTTZ5czc=; b=SK81pVnI+Vvb4GJX+hYOKTdwsp0B7vXVam7hD5AKvR0e69sGJmKBvy4c6BKPg3ezDKBLdL XWgOfn1i3GH6KdRblXzbHiwCbGXQycWY0yAOJQVP5JJvVLaUphGIfwBTeR2MpEkm4MbAUL Yl7zDz+eChHgGwouICPRiLXOlPzAgEqBciuA4s3ocmQEYU4leQMW6QVDu2PujAZhwDKbrB ltopkYc+ZxsbB+qIYwVXEdUkSTrJx8bX+iIDsiiDFlzmFTkHgjV/8D9yqtz2I4pli+pqOT DyvSpGN2KZWVAU6wNQWqWqKZlNe57eiUrs2K8hORAvEVsoPKoGCUwdNYEULxGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3KgN6Gn7z1Bk8 for ; Sun, 26 Apr 2026 08:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30bef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 08:32:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2c8205002d94 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 2c8205002d94697bb164217dcffb3b280729f022 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 08:32:00 +0000 Message-Id: <69edcd80.30bef.6027ca0@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2c8205002d94697bb164217dcffb3b280729f022 commit 2c8205002d94697bb164217dcffb3b280729f022 Author: Michael Tuexen AuthorDate: 2026-02-10 17:08:07 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 06:29:25 +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 3f399a6650a6..5f1e328d56f6 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -2127,41 +2127,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; } /*