From nobody Wed Nov 29 16:38:32 2023 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 4SgQ4T1JlDz52x5G; Wed, 29 Nov 2023 16:38:33 +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 4SgQ4T0qMjz3Jvx; Wed, 29 Nov 2023 16:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275913; 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=FhvqToeKaE+UrGhd9uqpx0jqsINDIR6LKrHcqYjXtig=; b=QcR1qesuFMZHqQ/bAldPFt4jrLeCUj5V9GjK8nU5gcC7AFqfBI2CxoBq9kxv7Un9l8CZva TbLaJQKg+YfMGvXPjDOE563fjg/x5aClf4DFKX5fSqv34AliIYsUpoHf5jBDNmhnzpMdNe OnqHuCOy3JT4S581ED3yWnPWQN6AKLj38gqfIe3nOssF3WFF7QWkuSZ788SnoyiNQ1FcfO DdKUmYtIr/cxIjLDBKg9isSatYZFvFRGwNOV8RJP+bkTtd6Vg2XTwTZ6eBkhoHI+OwhKNQ ErVARHavFeIaqJYTDMIc8miQZ0q2YTJr7n/wmXwIaPd3NEx/KQx7bs2ND3q7/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275913; 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=FhvqToeKaE+UrGhd9uqpx0jqsINDIR6LKrHcqYjXtig=; b=KLjE5GtBLrOKd37oEoJ7XFFS05JoP2//nDMSCQaalyPMpN9tj59aHw2MSf2XUy2U8MNdJ9 jlSRi6fuffLvtqHZQQ0nsSi45WthoqbGJP7bYbaYbQXUiNt5hjLKXXG6fHAP885wHv6KPp heIPP821MlnKZtVVoLOUMFJEGIx41kYIBvqNWMHw2x/F9VxzE4+0w9gRfKTwt8dy89cvc0 BXn1yFxfXHsqx0IKvR1Almn/BkqtwPrF5ZXTNESqCbLasTg1VarbW7WGnvkVOZeS4apfQy MziOJlsXUWfRVkWga4r24PFZuHnQMeV5+h7zjw47YWHzPABovrKZjA3p8iKcow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275913; a=rsa-sha256; cv=none; b=GXVAn2aB+m7TmbDugUJXmn2isvBr3TnaQ8Mc3rWgFyScwwVKdMV8rPWUCxEJEKsJRczcfF P91rg/OCwc6sRX+M04fpFU4Fkdn1jnBfuqaDL+Izs1Q2BCvQhNpIaM6WWSaLgEK+PQJEAH 2afcwtYOjXVBC4Z4PcvWLhdLtBaqtauguS0RkZTQIyPH2L2a6sH2IbzdZvw2KpXmi51ydI pMBXZZuQylivGVO5KXH7qfQ+JQ25teGHD3IDNppKJxA5gIA4NXIiYetvxRy6B4OOyQqqM/ c2BMr8QEQBGTGwmgnOYZgEO+o+EfA/33GyIrDQkn3N6BnV+DyARyGOGCjlHyAA== 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 4SgQ4S7159z1Cd6; Wed, 29 Nov 2023 16:38:32 +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 3ATGcWAo046113; Wed, 29 Nov 2023 16:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcWNt046110; Wed, 29 Nov 2023 16:38:32 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:32 GMT Message-Id: <202311291638.3ATGcWNt046110@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: 2dd2dd2f25b6 - stable/13 - iwlwifi: local namespace change for sysctl 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 2dd2dd2f25b6a8868b541442c035dffd99dc0ef0 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd2dd2f25b6a8868b541442c035dffd99dc0ef0 commit 2dd2dd2f25b6a8868b541442c035dffd99dc0ef0 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 22:05:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +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