From nobody Sat Sep 27 15:13:55 2025 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 4cYrZY0XjVz68DBv; Sat, 27 Sep 2025 15:13:57 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYrZX1P4tz44Lc; Sat, 27 Sep 2025 15:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986036; 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=2YuE1jluU/NdMwJTy3+/RMq7YOLWpDkL6BEJ7301TGo=; b=VbJ/Fbhn73YC7i5BJiwH146A88n6C0+VYasnm69o3d9nzdlHsY8g+dgKOX9cR7WUVo2j+P 4Ce/xuKQovbEpVnVPlUOgjhepYSAbE295U94764gGe7I9lJToqc5VfV3ibvRhknw9GNY56 xAsFeGSvPFILdwVCu6tQKlO27AXDjkRmx3SDZ015Av8uvv7iB972H2Ut5V92NSiGhZGXxA zfCAPweXkRcUrRFugxrfCwzD2hAvV7XBQb1QF55yfIMIUiN0RVncqQowW+QwTt8KR0fdSj NmNAxYPuzTnyra3IWT2bX5zHVRLcuhW5Z/5JNts5pP4ELEPfG0Z1wPARy4fljw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986036; 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=2YuE1jluU/NdMwJTy3+/RMq7YOLWpDkL6BEJ7301TGo=; b=adETReD0xyBiQ8HgU3hx5ma36hi/cNrLWJFfciQxqbodjbiP+AWFVVUd4Z3hkSRMadV88G uRtpYm5UBh4c8s73Rq5J5CmCUG1E00rwbIqFmlB384SgdXo56gau9fGBPjjnFB5rycQ3F5 bX3Gr312ZhlA0dKR4zujD2w94rRneYzCm8oRwMSqrsfYuggfYq9FhGxaY3bPsZ/jjhasbg a4Sr3AzY+39stYqHOwi25d1rAPqQtswO/Iodt4ZRdU0+hmpVN6ZSQ33deFnPRRqi5dhmBX gudwSUPlYT7CkdhGPa3l03nIYehZ/OysPpIhaFlq3FMLLPUCNo67LVtmFOoHnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986036; a=rsa-sha256; cv=none; b=GxXS2P9uZAS+qQmGnOdtWqBWk8Rqdrg0FkXB9FGLZP8Iwfh+aLucO7W8FIjTxUk0lQTB6+ tIWob8eH2p+SFq9/wAUNa3amdK9aT/DSpzQWHi/29G5aR0Z2EcgELWLl7/Zw/ydzlZz6uO xFBfSCYDnLwSvELcecCotqC3DrgpNlVk+BEvtZagxiD3GVT4C1frtGnIYKJf1PPc2CofBX kGbJ7WjEe7eFf26D9Eu2Z+jGHUSO/jjNY1blpBcos6VuhlPQSRkdFgGvVOa+H6Em1eu309 UKV0oith7Q0c47ymQoNRfJsGwDZywl7CfsUFCyJq/L8c1wY7ZS6A7MJCIFQ70w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cYrZX0cWPzfWN; Sat, 27 Sep 2025 15:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58RFDtIR083095; Sat, 27 Sep 2025 15:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFDtlS083092; Sat, 27 Sep 2025 15:13:55 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:13:55 GMT Message-Id: <202509271513.58RFDtlS083092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8d6bc14c5474 - stable/14 - iflib: Make iflib_register() return void 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d6bc14c547472aafeddae65ae64024a24c5c5a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8d6bc14c547472aafeddae65ae64024a24c5c5a7 commit 8d6bc14c547472aafeddae65ae64024a24c5c5a7 Author: Zhenlei Huang AuthorDate: 2025-08-30 15:23:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:35 +0000 iflib: Make iflib_register() return void It never fails since change [1]. No functional change intended. [1] aa3860851b9f net: Remove unneeded NULL check for the allocated ifnet Reviewed by: kbowling, #iflib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50713 (cherry picked from commit bb5135d0f2276e84b7abfcc481c92000647f68d4) --- sys/net/iflib.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index dc93da722ef4..1113a5e8e9f4 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -709,7 +709,7 @@ static uint32_t iflib_txq_can_drain(struct ifmp_ring *); static void iflib_altq_if_start(if_t ifp); static int iflib_altq_if_transmit(if_t ifp, struct mbuf *m); #endif -static int iflib_register(if_ctx_t); +static void iflib_register(if_ctx_t); static void iflib_deregister(if_ctx_t); static void iflib_unregister_vlan_handlers(if_ctx_t ctx); static uint16_t iflib_get_mbuf_size_for(unsigned int size); @@ -5214,10 +5214,7 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct ctx->ifc_dev = dev; ctx->ifc_softc = sc; - if ((err = iflib_register(ctx)) != 0) { - device_printf(dev, "iflib_register failed %d\n", err); - goto fail_ctx_free; - } + iflib_register(ctx); iflib_add_device_sysctl_pre(ctx); scctx = &ctx->ifc_softc_ctx; @@ -5458,7 +5455,6 @@ fail_unlock: CTX_UNLOCK(ctx); IFNET_WUNLOCK(); iflib_deregister(ctx); -fail_ctx_free: device_set_softc(ctx->ifc_dev, NULL); if (ctx->ifc_flags & IFC_SC_ALLOCATED) free(ctx->ifc_softc, M_IFLIB); @@ -5756,7 +5752,7 @@ _iflib_pre_assert(if_softc_ctx_t scctx) MPASS(scctx->isc_txrx->ift_rxd_flush); } -static int +static void iflib_register(if_ctx_t ctx) { if_shared_ctx_t sctx = ctx->ifc_sctx; @@ -5802,7 +5798,6 @@ iflib_register(if_ctx_t ctx) ifmedia_init(ctx->ifc_mediap, IFM_IMASK, iflib_media_change, iflib_media_status); } - return (0); } static void