From nobody Fri Apr 24 12:29:20 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 4g2C284f70z6bB0d for ; Fri, 24 Apr 2026 12:29:20 +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 4g2C2842Xqz3vG9 for ; Fri, 24 Apr 2026 12:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777033760; 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=6M/0X0Ur5w6Jb6Ad9A0wMV/OWe4fF3b0UjZS//bJYpE=; b=yM8PDLivS/exB+Djsj3NKzE1kbZFEUVOKrzJ4LDJNLMBpHKZlTjxblLxoIl2KjGxOJ9zBH gy3twgPcY92i40dUOShzLEarM7oQ2PsRUpEYZXXs89kKHaZWgSJyVzAm7UwLbvAQTwCchD NOan9mHeMazLdGuMQOVhYN6CMyEiQflA2o/bRavpuwu9uRTKpsiLF+P3LjggOILqf9jmXO PhTTmDGCFcV3YvywL2YtxmyQZgQTjR9T2uAQ6jakuHBE+/bRiC6WTxBIPyxt/R8UR34jcb G30qbwKYXhBpeq3os4RVid+GOdXOTv24UJv1JAdE4fKv7nrx99mzk6Lq8eoypw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777033760; a=rsa-sha256; cv=none; b=OL+dPBYeYaSQctKLYjrgBDNErGVX+SSBp6DHsaL8Vh+Bh74uYXQGripDGAcUPXZuWw5Loi nIAjKJ/PG9zqHYsOd60pFHwXJ5aiukcmMYuf6zzWz3z34p+CayYJ9Y6MXjEmRCZ0G0Hgor tRIMjE4iZbQ3/Mpf13DMwg/a4AOHaeNmtWSytIs8PWWslGYYBMuuS8sYcEBXvsYoc8PP9F oD/IL/A8dIq2x+XLpGu2HSmpCGAf1o8WA8rfOayug1IBn6UnHlqhybsA9mTwR1ff7dFTdJ zMQxNzSehHtsej8dZ7FJe4Pa5PdaOnx47+hALEHO1v1Xbu6VwL3AOdR3uc22Gg== 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=1777033760; 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=6M/0X0Ur5w6Jb6Ad9A0wMV/OWe4fF3b0UjZS//bJYpE=; b=i3/slyhaGVmeN2qEQQMp3vOBbposyb2mP2QTAoSayo6orw0f9TLgghu0teryHxwhqEfGbD eFGVLcrfI2RV/nHwhDU4EdMvQa8qz/BSC8HwCKL9wMlV5ZckpMRHzKxR/VYwlhb271sAqK a3umK884jjCXMRTrMjm9OsGF9S1vJUwhfXEqZD4bEZtXYKKdFurWNrWORw6h3NePcxXd8w 8G1xU29tOf0XYX22tf6Qr0/+TUC2a+RH6EnJFniiBApsia2YlokIZXcurp707xSolXc8I5 ETyEcTl1dus31GySfvk9rNo3TynruotA2nqX00Xg2fQ0CyLDYMFkB09OyHVoJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2C283dK2z137X for ; Fri, 24 Apr 2026 12:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a181 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 12:29:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8a1693d0cc53 - stable/15 - dpaa2: 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/15 X-Git-Reftype: branch X-Git-Commit: 8a1693d0cc5361362165010e8f529a76d29b52dc Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 12:29:20 +0000 Message-Id: <69eb6220.1a181.3665a540@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8a1693d0cc5361362165010e8f529a76d29b52dc commit 8a1693d0cc5361362165010e8f529a76d29b52dc Author: Michael Tuexen AuthorDate: 2026-01-21 07:16:46 +0000 Commit: Michael Tuexen CommitDate: 2026-04-24 12:24:38 +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 948e903f4329..d94770b3c3ec 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2615,26 +2615,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) {