From nobody Fri Mar 6 02:51:43 2026 X-Original-To: dev-commits-src-main@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 4fRrXJ0zWhz6SvLm for ; Fri, 06 Mar 2026 02:51:44 +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 4fRrXJ09lwz3n1d for ; Fri, 06 Mar 2026 02:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772765504; 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=do2SWjpDZ6nGpPD7ApVHToPhzd86hXs6PfC+V0C5I2w=; b=FqUzVJMSml1DCgigTJxGDKhZF0k/FzJu7qdZAEqGwOzEhOsrW4mkc5pE0p28O3VlMNL8Af MDqvB/wwQHOzAQe/qn4NHFL/l6eZSWBkMJBk8dStZzBbSCogqjnR3ni32RX7LdMdNox946 00EsyeSAh5bzCxnjoAec3z9KrftAfV3C5gDxIK58DTJz3Zysn2SjoTnbFtDTN/RbC4pv78 7hjLTHCwqF5SxafxviLRLeg/bozMIaUW6Cvb+xM5dlyn8m2lLc/Hgr/Z71hMev0iTb7qvz 8i8CVRA7aL8AQksGzCK8WHQgijn0oQMgnCG8j0iiwPAjtjStlxDDjPHKY4wZjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772765504; a=rsa-sha256; cv=none; b=qVy8xWBcX+VTmNM2oaJo7EOA+DwVpRbCE5eoHUmTHlZoyU9dOeK/AhlUfRCtsnfJCzwj8s jRQh2FzKTaCzr5CxUvUu8RoThiQKvyrk8iORRCAIXss+evdiXOk8ry7R6YJg3ThVIHBacb cOU2a/8lILApKduxDOK3zu80jzfEFR403lHy6r3w0TQJ/MG0+6+On1is9vsm/wt1KPEEIK fcch3JmStQ2SaaDBahNSB3p0ElfVAgAix65+muC5UrCOeHvtkxbAHWUXgQ2eKesOtghYeT VKrt472XJCS/CMau4S4H0d+TUN5nPqJaIbmZEL2rrh3pdHNxElAqdnoEBPw3vw== 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=1772765504; 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=do2SWjpDZ6nGpPD7ApVHToPhzd86hXs6PfC+V0C5I2w=; b=doeI1U7602/YnnSx8LEhBQfD6WPOIYVYGFTlAqjbGWszk3DmQScUPZ7yz4XHJ/2+eYjHs4 haqMXCe4cscr5GLRQmj7SOGgIGgAJJdFGB/fwJH8tEI9Q0Yrk1jyIcoJLGuZRkjQO6dlUs z1Jjap8QYQyFqIUz+YtILgOBwuXhTXa0qLERKU6mYSDu6CtkJ2pk+8W/p2T/TDwwHJU3u7 9f9RWh+vT/NQcFJE0qQZZhSoifS6nM+Gwmf9DlJgmMefQgorteo8MAcjn4YPDk3XOTX5gB iMJSSNeM53E8RWhon8zg+ioSU/nediQDOGUMrmX+ncSYxDwMbwvQ32GyB6qg7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRrXH6tpTz13wc for ; Fri, 06 Mar 2026 02:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3391b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Mar 2026 02:51:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 551c4cb74a80 - main - iwlwifi: mld: move module_init() to SI_ORDER_SECOND List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 551c4cb74a807ceae55288bf273f5cfeb37c7c91 Auto-Submitted: auto-generated Date: Fri, 06 Mar 2026 02:51:43 +0000 Message-Id: <69aa413f.3391b.12f726e4@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=551c4cb74a807ceae55288bf273f5cfeb37c7c91 commit 551c4cb74a807ceae55288bf273f5cfeb37c7c91 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 12:41:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-06 02:49:07 +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 MFC after: 3 days --- 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) {