From nobody Wed Jan 21 15:29:48 2026 X-Original-To: dev-commits-src-branches@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 4dx7RK1x2nz6PLd7 for ; Wed, 21 Jan 2026 15:29:49 +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 4dx7RJ6g9yz3dfp for ; Wed, 21 Jan 2026 15:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769009388; 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=7Nhq8U/YgIhNRMd4WXf6YYGkYYwYAMeNhUWcVRaL28c=; b=TRA0kAxWBy73hs3IEFxP2t1rMxndltZmqdRZ9MEqqh8PPB/QJ74Q3UYo6zpX5dgp2z9uFU F1BsXmCreLWv+8x8O4sBXk1Zt15KltPh5EO2aGAkmMV8flZNjQotujlHrKd9EJ4TWn9JWw +llGfKlTzFEP4HpJsSB8dVuu+rVXxh8zu/ZVHLBp7MD7cPkmlXm9pku51Yx82w5qWrr1N6 yRPzZ5RFQ73qCg/UOoWZjibYRK0NjKyZffqh1dgv3IYunrKd11mPStv6vHWwn2i/t23VCp hNXfI3dZdV8Z1sKvO+vxxcuGRw2nXDNc/+oXHMmUTVJHfhXA8QHyy6pgm/ldUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769009388; 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=7Nhq8U/YgIhNRMd4WXf6YYGkYYwYAMeNhUWcVRaL28c=; b=lhjmrMryZGMozJg7kp7K7zH8bj4jm6Mv8nEc0lnULEJK+j0dAiOTEOZuS86T7/4ogLKLTV 73m/Y++cTqqtu6542dTzAncz3oMouySeZ7JmeYtVZrIw8YpInjIP8oY9TCE495Fsciws7O zujE0xJW9WV76fHM3nb9dJOkJf4IYi2IvPQpZTJIHpaNNu/Uj0N5zuGONYfMu+bD0BxkW+ e3Nf0ZRsHcjoEn7naDmUYTRazCgZJzx/jAFtXPMdzXLJxpv04ZSkeHLbCekgRUTvm81yXh OcVAcOhc8Ijjalv5zIFtE0S5ZjyVXNhFciL9/WEvoNTymccfgQl/Q0eF5nl9FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769009388; a=rsa-sha256; cv=none; b=Z+ABuXEN72OfHZx53Z5or0Tw+o1q6ajv8H94t+H/on9tavC4ovb6opaS6SlLTIDPlRV2vf kYcJLT7eeC9vRymPr/tFzktnZXj9aIJz1b/AhO7KNlWp1rqje2axtFvJ1o4ta/TvDK84vO 5NAQ3dJE5rJrl1dRHFT/66eJU9NerpFfGCxBWSx8n5poT2zjpuF6ehtuaD32QT/mkp0X2s htNYYhDsoRgk6Qb9Y/7DiZ4pYIS6NTxItXBdVLXHCH9b4wBrv9UurTQxynMF9XHI2MxKoz U6lHbyDuvnAPGKA9UafhcI2aLhnuZo3pX0qEohuxjGTt/tf/rbjt7s5t6Q6Eew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx7RJ5QxQzt0J for ; Wed, 21 Jan 2026 15:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30aa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:29:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 35c9d8f04a19 - stable/14 - dwc: cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 35c9d8f04a192310d37aa13e5749f3a6933693e8 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:29:48 +0000 Message-Id: <6970f0ec.30aa2.1dabe027@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=35c9d8f04a192310d37aa13e5749f3a6933693e8 commit 35c9d8f04a192310d37aa13e5749f3a6933693e8 Author: Michael Tuexen AuthorDate: 2026-01-20 10:25:31 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 15:26:48 +0000 dwc: cleanup Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54788 (cherry picked from commit 3d771e0db66da77da5a7f323df1c0638e6b586ea) --- sys/dev/dwc/if_dwc.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 898fc75d2653..147b6351a9f8 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -523,7 +523,7 @@ dwc_enable_csum_offload(struct dwc_softc *sc) DWC_ASSERT_LOCKED(sc); reg = READ4(sc, MAC_CONFIGURATION); - if ((if_getcapenable(sc->ifp) & IFCAP_RXCSUM) != 0) + if ((if_getcapenable(sc->ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) reg |= CONF_IPC; else reg &= ~CONF_IPC; @@ -713,7 +713,7 @@ dwc_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) m = *mp; - if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) != 0) + if ((m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6)) != 0) flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_SEG : ETDESC0_CIC_SEG; else if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_HDR : ETDESC0_CIC_HDR; @@ -854,7 +854,7 @@ dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc, m->m_len = len; if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); - if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0 && + if ((if_getcapenable(ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0 && (rdesc0 & RDESC0_FT) != 0) { m->m_pkthdr.csum_flags = CSUM_IP_CHECKED; if ((rdesc0 & RDESC0_ICE) == 0) @@ -1254,18 +1254,14 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - if (mask & IFCAP_TXCSUM) + if (mask & IFCAP_TXCSUM) { if_togglecapenable(ifp, IFCAP_TXCSUM); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) - if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); - else - if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); - if (mask & IFCAP_TXCSUM_IPV6) + if_togglehwassist(ifp, CSUM_IP | CSUM_DELAY_DATA); + } + if (mask & IFCAP_TXCSUM_IPV6) { if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) != 0) - if_sethwassistbits(ifp, CSUM_DELAY_DATA_IPV6, 0); - else - if_sethwassistbits(ifp, 0, CSUM_DELAY_DATA_IPV6); + if_togglehwassist(ifp, CSUM_DELAY_DATA_IPV6); + } if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc);