From nobody Fri May 13 17:58:44 2022 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 2939E1AE8EE2; Fri, 13 May 2022 17:58:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0Gbn1Xtnz4X70; Fri, 13 May 2022 17:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464726; 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=TflyvsbIk+5u/h+UlEMJF0VdTQa6bYocBmT5/Ou/6VA=; b=itwlyk4W1oG6130zrMRfYDaw7+9/vt5nxyWTOpnd3rEqgxw5/t0qw4gG3Rt/6Ji6isAD0Y 1EIxYASq3fRLOk2+RsLrHxZzMAsOcRJPvzh+493ZLxJeUQ4WixSCOJqSefzcOd9+wx4Vbw U7bEcRCQC4uRBN7zxBeQilFnYHt7tEgXKh+/ecw18g9cFIJgK0P1gQvXN9cU/2nMjR2bbF 96TwZeTKuV3N+RyzeGC6or4J3am0ScFN+iOR+jd0WuNGFfdrvurCShAV21auO1OsO+5VXg UkAkiLaHGUYI+p4QqGZD0y4AH7uJwVl4Z2DIXqRKctOBdvknNlYMbqwAHygZjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D176F275A3; Fri, 13 May 2022 17:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DHwiF0069469; Fri, 13 May 2022 17:58:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DHwiwu069468; Fri, 13 May 2022 17:58:44 GMT (envelope-from git) Date: Fri, 13 May 2022 17:58:44 GMT Message-Id: <202205131758.24DHwiwu069468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 872428aceaa5 - stable/13 - qlnx: Return error from qlnxr_mod_load if it fails. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 872428aceaa586e54eb7415a9caa81dd9ac7ed72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464726; 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=TflyvsbIk+5u/h+UlEMJF0VdTQa6bYocBmT5/Ou/6VA=; b=BTumVbnVAcU3V/VQE8IN5O+svwRw/RmnFogmx8nGAjdBnMd+Gs5JIN26FXwUCam0sv09xs foohdatXAht47s2v7QcoUtLRgnczTlvIaazkk874GJ1pprLPMrmkF6omio3ga3QFI7Xe5w JRp4Hp8gqrg4oehyFKzqH6uOHXGPr/kadfYu8MeSFUAo7k1Cp0q5smp0lUGE5ojUDLbNU3 fl4N8DsJKS5+ABKmmbYXp/V4mxx7uedCLfgXCyXQV2jn6wyD9Xb0Q9CM0HGj8OmgZcuv7J CQyG8tw30URwLyiq7qHRIUURYCc9b/9DSyDtKQQikt+GtJ2O3HrbHF8CeIIiGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652464726; a=rsa-sha256; cv=none; b=g2bpx3JmfrWAS55mtvdzyVL78yMnY1EyaOP3Nt1MmOYfGXNqgJHjYmSBOguKY22b/3Vk7y kzqRimeNJalY/KRlNphDB/3y84aWHIHCOXBXESGQ73P8B5++tne3opuaaOlSOb4fbWUrFU ZUFZ8dImaGPIqc3kR3YpZne/ROFrdemf4w8BhvdJPGc1YwyKrME/2MFdk5qRYf0jV6PQPX 6Jwh/C6gaZrcibf2CKfKYt1auYnTy/E0UyPTJrYXyIcwftj/exl7H/18AaFR6HhAp24NSn rURJT37MpHrdjfWxyLlj42Ey/B9ZRfHCkerOGtzO7qzXk6tk413cOkjpn1cnGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=872428aceaa586e54eb7415a9caa81dd9ac7ed72 commit 872428aceaa586e54eb7415a9caa81dd9ac7ed72 Author: John Baldwin AuthorDate: 2022-04-08 00:01:27 +0000 Commit: John Baldwin CommitDate: 2022-05-13 17:43:38 +0000 qlnx: Return error from qlnxr_mod_load if it fails. Fix qlnx_rdma_register_if return ENXIO rather than -1 on error and propagate that error to the caller in qlnxr_mod_load. (cherry picked from commit ee07d712131468908a61b948851ce17be76931ac) --- sys/dev/qlnx/qlnxe/qlnx_rdma.c | 2 +- sys/dev/qlnx/qlnxr/qlnxr_os.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_rdma.c b/sys/dev/qlnx/qlnxe/qlnx_rdma.c index 5929fee5d263..276219134843 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_rdma.c +++ b/sys/dev/qlnx/qlnxe/qlnx_rdma.c @@ -249,7 +249,7 @@ qlnx_rdma_register_if(qlnx_rdma_if_t *rdma_if) return (0); } - return (-1); + return (ENXIO); } int diff --git a/sys/dev/qlnx/qlnxr/qlnxr_os.c b/sys/dev/qlnx/qlnxr/qlnxr_os.c index 62c0f2091d2f..22d968ce2367 100644 --- a/sys/dev/qlnx/qlnxr/qlnxr_os.c +++ b/sys/dev/qlnx/qlnxr/qlnxr_os.c @@ -1293,7 +1293,7 @@ qlnxr_mod_load(void) ret = qlnx_rdma_register_if(&qlnxr_drv); - return (0); + return (ret); } static int