From nobody Mon Mar 09 11:03:52 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 4fTvJm6Ntgz6VZNn for ; Mon, 09 Mar 2026 11:03:52 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJm3mg3z3lcB for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054232; 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=cu23WnGWAUMzFNVORijRmagplOMeOiHKU6gavvarBW4=; b=F5a0Qx/j3ibBzMd2+idxDjXAu4T58Pppfqlt5A9212HpJ3POdTBRie310O+Qm433FP9xve Dnz5vt/3NM/vGT6reeQprApmqaarn1cwm+UfS9MEBtsY5qLREDA04hMK9zCyqsRzqEOp6D P1Q2gIfxKGLOo/y2h5NK/hy/oqnDxyN+0Z6N+osPVTlKhEGRxRnBTVIETr10onhFkUCCjA QXNFV6/n1aP17E+glndlIxug/OYBDB4+Q4rcAT6Tmu4x1TF2ruLEGeqUbvKyKgVU9M6/em W62cDO367x1y6SKJ9ex11t156sA8kYFnsGITM2gaart8vWGaL74iZGsfH7UiKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054232; a=rsa-sha256; cv=none; b=SnAjZzsPn5eYpSByeXJsf7wlmPF+2zjyLsQPnToBmCWrPncwbo1PEk1LPaVhkM9Vzg2z4I STsRlYHowSlTqG6nhEvXsiTdqFJpxx6tHD23fnpigopEs+/lP6K5cDoxGWL8R5eJMPw/Ek FsPDs6bv7v39UyKSLOf6xbn2DnxGpjUAIasswV0gMCDdmJZfZJdMHoel59lukqGc63pz9v R6f9gOyrLjmUFXc6TJM+mhw7qnFgGMl28MgSk0hDD/Mnl03Vook+4pxcRAL8ykbea/Y2Gw tBtRC8SNZuA1vSFWzdkz/vSWPgb7ewwbG06Qjv+AtiSzUZvmiH9/AE10Bv+nNw== 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=1773054232; 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=cu23WnGWAUMzFNVORijRmagplOMeOiHKU6gavvarBW4=; b=OheMQhlZCLFQQpi1hkNbfyNn7NJQsEyJb1bI9+5/voXftNjBRlS8t1KwyE8iliEtWbNczr Nq4Ig9fKXsPVxw8U1aqosifrp+lhxkxdl2dFn6wj+enqh/DGCDf/lS02fc39B8XRl6sBCl 24d6OvOyTUs0pJDcQPdIEmeKZLdnPYPTHtyqMbNDLEXRhPX0Fid89QjsPskn8/I+/dnv+T N1ZhA/LMEabM00iSeqd2klQk8sZtKGA9Odd3bW8T8JpCQLAPNM1cyxnySKP+F0yI9eXHgE fanNb7fHKeKrBJDjygpXTrA9BJprIlsh1Tk22rXMMNtr5Dx9jObyY3EfzlIpjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJm3JJwz6QN for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4726f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 169ab967e24b - stable/15 - iwlwifi: mld: move module_init() to SI_ORDER_SECOND 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 169ab967e24bbb097f228e22c07ddb89ae3bfe5f Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:52 +0000 Message-Id: <69aea918.4726f.1a8b1b@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=169ab967e24bbb097f228e22c07ddb89ae3bfe5f commit 169ab967e24bbb097f228e22c07ddb89ae3bfe5f Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 12:41:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 iwlwifi: mld: move module_init() to SI_ORDER_SECOND In FreeBSD the iwlwifi driver is a single kernel module. As for iwlwifi/mvm we need to make sure the common "iwlwifi drv" code is initialized before trying to register the mld sub-driver in order for lists, etc. in the registration code to be initialized. We do this by using an extended (FreeBSD specific) version of module_init which overrides the order parameter of the SYSINIT. Otherwise we can randomly (depending on SYSINIT run order) run into a NULL pointer deref panic. Sponsored by: The FreeBSD Foundation PR: 291120 (cherry picked from commit 551c4cb74a807ceae55288bf273f5cfeb37c7c91) --- sys/contrib/dev/iwlwifi/mld/mld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 7b46ccc306ab..8075b886ddbf 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -44,7 +44,11 @@ static int __init iwl_mld_init(void) return ret; } +#if defined(__linux__) module_init(iwl_mld_init); +#elif defined(__FreeBSD__) +module_init_order(iwl_mld_init, SI_ORDER_SECOND); +#endif static void __exit iwl_mld_exit(void) {