From nobody Mon Dec 8 15:44:26 2025 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 4dQ5rV4MVCz6K07J for ; Mon, 08 Dec 2025 15:44:26 +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 4dQ5rV1ztZz443P for ; Mon, 08 Dec 2025 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765208666; 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=z7b4rivyzba2WnaPtI9pLAQqKeyLO49A1Rde74dJZfQ=; b=CREtjWSxwhoiO5HgHCi0BqjoTVWxY0JvQec5NyWbj2KPPNuqW3ADFEUMlsaZRU+e4Xfmr/ 3kkOdIjwn7vm2dGMPQAa7s1bqj2gqzkT1EV/BS9CF+lNgpFDjWLg8w8vPft21gHTB+0WLB vJDk61Lz1I6bWSwSJIMTAYVcWnDIx2KtSdAL14NeEmwVvweZky492hvBybgjjjcnvYhmP/ 3hOdeRSczuM12a6vddY8G2UebD7vjfCA6Q8oSvvRB3S1GONSyfcz1QUkLFXDrCVEL8xw22 9XQDcPdE5Npw7a9a26lt3oocDPoXGYt017gsqylrieWiK64Rh3Rtg1mpy5j7YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765208666; 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=z7b4rivyzba2WnaPtI9pLAQqKeyLO49A1Rde74dJZfQ=; b=oghBU2wJNpCvaEaCoEgHKLUtc9ZdHur1vQzHodL9+DGC/RdsF2Zh3+mSLctrCrxUkj4Zb6 wxJhWVsEjZfEBVGS1N7fqSMG2MI+/kD2x8MVkMU4yg+R/H1NeScIF7SUoS78c3jkR/iz1P EeRtlcFZ0RPJOrQorTyeUY17zvvN2tNt+pgvarVzaZYHliEr9J8H671w1ZSM6VARuyebmU 8q1lB/vAT8j/w7Ft0Ne3BIut8wZ8wucvOJFjlT694y8MxqQYh7ec1TmSM3e7Fg9tZPAsjC wJA8FE9219VDyKP3tBfn0idK+aY83svewQD+FFs6tKLyqtIYxLZ1gG2Bbf5JOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765208666; a=rsa-sha256; cv=none; b=MeZegvclx+I3C/fmWdjiCp9XA9W2UFbTiGawNBhyrmHMho/74zB2OGd6pQZJ/oEHkwHKUz pos7BlU182l2JBbUyy3WK3Owde/q0clpQ0djpxJ8IMk5eDHMVRJDLKtvsMq62VYvj008Pv 8aa8KeCJA9W0ubNdAHd4VyMeXWjT/g6jUTK64wZwo2LDk57YmRA6QihS7zOI28ZR/eYG+m SQTJ4MjouPwpijSjA5cG366qAGGtzkNYAjSM9qW73sNt4JIY3IPGhCoGt+0TpezqQ+mkef agNCdOf1fhEqNHd0TAM6UeC/KfDdfpK0zj7NOjbybmsnv8pS/+8mIt8OSmXCng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQ5rV1PH7z3sq for ; Mon, 08 Dec 2025 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 374e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 15:44:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8f7cbd2ecaf1 - stable/15 - mt76: add LINUXKPI_PARAM_PREFIX for module_param* 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: 8f7cbd2ecaf1fd89974c15f0598a67ee57fc5afd Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 15:44:26 +0000 Message-Id: <6936f25a.374e8.c584daa@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7cbd2ecaf1fd89974c15f0598a67ee57fc5afd commit 8f7cbd2ecaf1fd89974c15f0598a67ee57fc5afd Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 01:05:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-08 15:43:54 +0000 mt76: add LINUXKPI_PARAM_PREFIX for module_param* In order to not overwrite sysctl/tunables under compat.linuxkpi we need to prefix the module_param* names with a per-driver/file designator to make them (more) uniq. Add the FreeBSD specific LINUXKPI_PARAM_PREFIX defines for that where missing in mt76. Sponsored by: The FreeBSD Foundation (cherry picked from commit 853e0440c97a4a1797edd6d653fba4398dc885e8) --- sys/contrib/dev/mediatek/mt76/mt7915/coredump.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7915/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7915/mmio.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7921/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7925/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7996/coredump.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7996/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 4 ++++ sys/contrib/dev/mediatek/mt76/usb.c | 4 ++++ 11 files changed, 44 insertions(+) diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c b/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c index 5daf2258dfe6..8c9a69837c86 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2022 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c b/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c index 0df2bd93c82e..9214286ca000 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include #include "mt7915.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c index f83f4eaa8a24..17c9c261960f 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include "mt7915.h" #include "mcu.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c b/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c index 83a828b7c578..ace2441d41a9 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c index 4b95d7c0a225..57b9de7a6659 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7921_ +#endif + #include #include #include "mt7921.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c index d62d461db699..77e494a4ece0 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2023 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7925_ +#endif + #include #include #include "mt7925.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c index 3417fc5db6a9..e34f99abd16c 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2023 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7925_pci_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c b/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c index 303d6e80a666..433846d2319e 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2023 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7996_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c index 5099aa2004b7..443cd21a32b8 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c @@ -3,6 +3,10 @@ * Copyright (C) 2022 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7996_ +#endif + #include #include #include "mt7996.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c b/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c index bb82f5807ff8..05a3d9019167 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c @@ -3,6 +3,10 @@ * Copyright (C) 2022 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7996_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/usb.c b/sys/contrib/dev/mediatek/mt76/usb.c index f9e67b8c3b3c..11f9d2808f15 100644 --- a/sys/contrib/dev/mediatek/mt76/usb.c +++ b/sys/contrib/dev/mediatek/mt76/usb.c @@ -3,6 +3,10 @@ * Copyright (C) 2018 Lorenzo Bianconi */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt76_usb_ +#endif + #include #include "mt76.h" #include "usb_trace.h"