From nobody Fri Oct 06 14:25:21 2023 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 4S29gk0R45z4wgms; Fri, 6 Oct 2023 14:25:22 +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 4S29gj6YsVz3RTW; Fri, 6 Oct 2023 14:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696602321; 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=HCqEiX6GyY7wEMFrkzpRbaaIIRPD7/PnhT5HkrLqO8k=; b=lCXPsQRdTMzc2zqZz6Ww/A9XR2UzI29TuwR1lnRU+JquEimcK6sY4ihhPCbcxisxg90rXw yckH8yXaF07StqUalQR0Yzt/CtybGomBBOtEHLgV/bhPfQUP2jeNknapr1ravc85yXdzf0 KYPUEarBn3wTsIDVmWMXSbsAiuHNO7UZI5e968jOagPRTnM57z9Sg5lm7ruebwxZMRYyMV RBzapYkTa4qy6P4XDHEeerakdd2pLOMVDEYCG3qNjyoLyxjXs+M21RNvXz0O5gXom+ANIw FfWQp3cBNHk6e0qj6pgfEdtoyW6phiGlC6XMp7cuuX4EtzL526nMLgxY2jJzSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696602321; a=rsa-sha256; cv=none; b=VfKFcHqwQeA1hFtDoD1PibYFv/iLPFNjr24buN8SuVw6S3Rfx1n8J/lU2pJlIe4gzcFyDv sTa5Nw3V/aWJHojVrxQyZmQK9wal7tuIp4xKiruEV7TuZKY6GPqlLgxhPNQWMjJpFCcNRo 5qPEsOLi08TmNTy9VyB5VtucEbMOsCOD232jXz0HAst2AkWiIOWY7XP475hNDJq0MNm19R +n84FRzgM9G47TWj0kYsTJDunWb69WlC6mlNenlGRjq3mx3Fr8Z+7++gKOJQgjKuz8UACw +BZtUs+B1kJ+JB6OvXPPoUPx/s2KNKT+weUQYjMhT92fIiGXvWJnFJrTAIKKuw== 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=1696602321; 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=HCqEiX6GyY7wEMFrkzpRbaaIIRPD7/PnhT5HkrLqO8k=; b=G6dspLwiBZA/xT9hylI0sl+VLLJJ79uJmqeJAWQDwToc8yKdUOVB4sZoj1nNLc52sqQ4X7 HQTOwsft8wCtZI0DsXDwHOlbHTTYCR/C+ZBQbxuKWz3cOqyHi/ZbnF63KDn/xTA8TIeH9T 9C3kFvTLWsLAdQWbgANpu0sauRQl0jhaMXhcCR+sYyzUwxeTl8KF+j4GXPjK3v9qj8q6Ay qQSVJdJCodadEGeILOjFJY5nRX76I1v7LwFLjd/pCw3noJdpLG+Vlnub8hgaEjBm428oX9 1jaLf4uirmI8mNot8sKVZLXPAM/z1+BLyW3Vpfyuv+hGEXLOb1Wvt2VqJ7sebQ== 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 4S29gj5ft4zrNp; Fri, 6 Oct 2023 14:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396EPLYn093778; Fri, 6 Oct 2023 14:25:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396EPLmv093775; Fri, 6 Oct 2023 14:25:21 GMT (envelope-from git) Date: Fri, 6 Oct 2023 14:25:21 GMT Message-Id: <202310061425.396EPLmv093775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8aa738297b57 - stable/14 - iwlwifi: local namespace change for sysctl 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 8aa738297b57e43b4847b6c38ec16c51f6d37db5 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8aa738297b57e43b4847b6c38ec16c51f6d37db5 commit 8aa738297b57e43b4847b6c38ec16c51f6d37db5 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 22:05:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-06 12:47:41 +0000 iwlwifi: local namespace change for sysctl In order for the FreeBSD-specific sysctl (which gives us a full list of PCI device IDs/names/and firmware prefixes) to be in the proper namespace add a LINUXKPI_PARAM_PREFIX definition to the file as well. The sysctl can now be used as: sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name Sponsored by: The FreeBSD Foundation (cherry picked from commit 0a22677bce28bc9ad39f219b726b5791852d84ba) --- sys/contrib/dev/iwlwifi/pcie/drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/pcie/drv.c b/sys/contrib/dev/iwlwifi/pcie/drv.c index 3bde223e3f9c..0aab7a1fdc8e 100644 --- a/sys/contrib/dev/iwlwifi/pcie/drv.c +++ b/sys/contrib/dev/iwlwifi/pcie/drv.c @@ -4,6 +4,9 @@ * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX iwlwifi_ +#endif #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include