From nobody Fri Aug 7 22:14:59 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 4hGz3X6tqvz6nrj0 for ; Fri, 07 Aug 2026 22:15:04 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGz3X56Zsz3Sx6 for ; Fri, 07 Aug 2026 22:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786140904; 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=DMH3CoMQU8x8OAhJZpx3A0UOtX7cgHM7uMsJAK4CPHU=; b=dvTTo90Qr+ICRIoCCRmrzf6K31OSvzfls2Y5a/KFMYOuIsm30QyaUbS2DjrAAEdB582WiD olDBPQzQIbc7i46SPuIppPwLFZXAY9+udcmJ85u37hhDBUQTiUyA0Gt4AjH8nDAQPfDywU qox7tJy6U5ChamQONnyGH7K16WiUXEIAh70ot+fXhaZdOPQrHz/T5Ndm9qN5EqitHhywQz ReiCruZDjybZUF6blddJqISpmszQ2+C7ImhWFR4jdIJGIhsV2J22SNS6jCp5h6gflRQxO7 x78asZmu6lJWeqo2p8IZ+E3jz+HIgUWlGKwwnPWNuzlgZcvYf1lRD2FCRPDzHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786140904; a=rsa-sha256; cv=none; b=x8AWag/PEqcc39rKbGmFTu6VKIPOO+B7oS8CT21P8QGWC/wjJ2iP05osBOQKOkgyfJoUyw AO0hvvN7DUZbrVYlZGfyjIBX5PUvFvMRW/hps/26jWeSyUBhffHoeuAhiDumTMdyxMmBBw CKQdQce7/tVJAbGB71pdWiJqBSgnghQqQQQjzsHDa2eLd5AMAyLGrDX6RQecoYyVBBgEoU gtu06RAEzumuK5Gw3+GDce3KHpVEB8NtazSwFED2rVqtetqVxofnmn1iTV67ooGjMzom/a 18omn2RLVzQIB9jxG7M4VfNZ0SnZt2bvCeKnu7NuwXocqYx47FRCjRmRuOjVMQ== 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=1786140904; 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=DMH3CoMQU8x8OAhJZpx3A0UOtX7cgHM7uMsJAK4CPHU=; b=ygYqzvGpCtN0JWYUy4EQYd7mqan6Z1H0nKcU3DPkmtAsWzSlH0ga4f3FyEOFvY2wGtGKgA FP5OMEjuBYLnbqjg7kAdLWPIdLhE47WqiQ+3WNTMtyL8+gZBREcfJSNiTiZr44gtbttKjE joSqbCHWYjZrtdSY0nWIMC3uwScOwSSpH7FsZJguSxjyGpmjHAKRb88o59wajRG+12KOtR zx+4zTxz8wSPrb1J9qVUomf3T1X8x9VM27jWt2m86f/S+zZO3vkDiPWZru7VA9FcP9FDBu ilX7GlqEckzXSjS/4/Gdu2tAP+EsmR/HP8hWNv3h5DU3p4UYiSFTgJbap2P71g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGz3X3Gb0z1PPW for ; Fri, 07 Aug 2026 22:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27bfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 22:14:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2ae8976a3f6a - main - ocs_fc: return correct error code from ocs_hw_set_persistent_topology() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ae8976a3f6a7e4deb1905326145f5c2575264f4 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 22:14:59 +0000 Message-Id: <6a7658e3.27bfb.1d5229ad@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae8976a3f6a7e4deb1905326145f5c2575264f4 commit 2ae8976a3f6a7e4deb1905326145f5c2575264f4 Author: Gleb Smirnoff AuthorDate: 2026-08-07 20:46:22 +0000 Commit: Gleb Smirnoff CommitDate: 2026-08-07 22:14:53 +0000 ocs_fc: return correct error code from ocs_hw_set_persistent_topology() No functional change, as current callers either don't check the return value or check it against OCS_HW_RTN_SUCCESS only. Found with: clang -Werror=assign-enum --- sys/dev/ocs_fc/ocs_hw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_hw.c b/sys/dev/ocs_fc/ocs_hw.c index 62ef3cd49be3..f4935db8f321 100644 --- a/sys/dev/ocs_fc/ocs_hw.c +++ b/sys/dev/ocs_fc/ocs_hw.c @@ -12209,7 +12209,7 @@ ocs_hw_set_persistent_topology(ocs_hw_t *hw, uint32_t topology, uint32_t opts) default: ocs_log_err(hw->os, "unsupported topology %#x\n", topology); - return -1; + return OCS_HW_RTN_ERROR; } ocs_sem_init(&request.semaphore, 0, "set_persistent_topo"); @@ -12235,12 +12235,12 @@ ocs_hw_set_persistent_topology(ocs_hw_t *hw, uint32_t topology, uint32_t opts) if (ocs_sem_p(&request.semaphore, OCS_SEM_FOREVER)) { ocs_log_err(hw->os, "ocs_sem_p failed\n"); - return -ENXIO; + return OCS_HW_RTN_ERROR; } if (request.status) { ocs_log_err(hw->os, "set persistent topology failed; status: %d\n", request.status); - return -EFAULT; + return OCS_HW_RTN_ERROR; } }