From nobody Fri Apr 24 13:17:50 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 4g2D6C3Pdnz6bFtc for ; Fri, 24 Apr 2026 13:17:55 +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 4g2D6C27ptz43hg for ; Fri, 24 Apr 2026 13:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777036675; 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=byaoS3jUwkStc+DtbU5N8kc9V7F/CSOfUklJSQ1Npyg=; b=ixsiSJOFItZa3cliw77rI1x3UHXe4axL8OU8TqJqvy0q7sJyUaUAkq8lBRtM/UOfOekcRO u79kmJEVICokphFzKPJ2IppvZO5oAN397UBnMKKS2Rm7xJQoZY2JAMSOGiRQqtU0b31WL2 6t5mPePsA3bxLuMvytqWIIOfrxu6TGLJlVu8ZViSExbPTHjw7/EeckoAxXsc2qnDS7moez 7SH4Wr8APpnrXLUqgZBSb0KpW3ZV4vHdsG7qQNIbSjc6tVbIodKzN2kM49ZVkmQ0WXPRRp +B9p263XfRylS1XiSvj91sQqRRbfYSir6HfgiRyTtmZFz4weGpMnZ94h80V0NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777036675; a=rsa-sha256; cv=none; b=yskWFrPABNaCXMggvxM12kQ9lmsVy6uc5WqSjBZJMOGjuuEKm6hXh63N07HlgVWuj1Y8Y2 8b8uEFpNPK8qgsxoI6pn95kjro81RlWnH8WV/edZh7xHPXNrzos+16+vFStuOos02idjyJ O+LaYYNpgLiYbE1QTWwCrvAWocr2pObfGtVKlDULtCSpmkPKDrjysvROLt51Pch0dcxkmW nbo2gdwqNP7bTOitpwd02Il1h3fuaYJgww/ukR1g0vYLpvlv+UZxl4omJAGiXqy6ewrvtV iiyapwcKl9eHMAdXEIO6lxKY8X7xaw4Af/Xo4n55IgtpJrC5UWj+lw07iNR10Q== 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=1777036675; 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=byaoS3jUwkStc+DtbU5N8kc9V7F/CSOfUklJSQ1Npyg=; b=syxStKytotX8PMCcTuNOXrdJ75Z3L5tJ6gsMkZ9TB2alsF07lai7tC/AyZdkrD21G7vywH ge2XTw1mBPC1riV5fHkiDmxHpD3OBtz032a1yezQ904kdY/7nqqOVpkq3hOXCHny47ygil llCA7ytTFnInVE3N2GmjNWdF/k3tcKbQO3CNTpSc2uQCMudF2FJT7x6z0drkOKdSA/P3EI EbutYcempqOiMNqiXUj+MlFu5pc92wRf5+M26kcWzdDrT441Rajqse0Qv9QcAFhffkWcrz rjne5rf5xbWrpGOEYJXa0JNLCKXjalhvp9o5HafeJj/GraCrJ7DLyFnX1VXD5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2D6C1VPqz14Lx for ; Fri, 24 Apr 2026 13:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fb7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 13:17:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 074f7743a9ab - stable/14 - dpaa2: cleanup 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: 074f7743a9aba904db96a866ed9ac87936ac09f4 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 13:17:50 +0000 Message-Id: <69eb6d7e.1fb7f.7eb5ec4c@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=074f7743a9aba904db96a866ed9ac87936ac09f4 commit 074f7743a9aba904db96a866ed9ac87936ac09f4 Author: Michael Tuexen AuthorDate: 2026-01-21 07:16:46 +0000 Commit: Michael Tuexen CommitDate: 2026-04-24 11:09:54 +0000 dpaa2: cleanup No functional change intended. Reviewed by: bz, dsl Differential Revision: https://reviews.freebsd.org/D54805 (cherry picked from commit d8b8dc776b7ce28bff8939dd185b4d6554b5e351) --- sys/dev/dpaa2/dpaa2_ni.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 5f9282e120e4..20d4440b5532 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2583,26 +2583,10 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) break; case SIOCSIFCAP: changed = if_getcapenable(ifp) ^ ifr->ifr_reqcap; - if (changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { - if ((ifr->ifr_reqcap & changed) & - (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { - if_setcapenablebit(ifp, - IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6, 0); - } else { - if_setcapenablebit(ifp, 0, - IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - } - } - if (changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { - if ((ifr->ifr_reqcap & changed) & - (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { - if_setcapenablebit(ifp, - IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6, 0); - } else { - if_setcapenablebit(ifp, 0, - IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); - } - } + if ((changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) + if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); + if ((changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) != 0) + if_togglecapenable(ifp, IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); rc = dpaa2_ni_setup_if_caps(sc); if (rc) {