From nobody Mon Feb 10 14:52:56 2025 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 4Ys6y344yxz5mHDw; Mon, 10 Feb 2025 14:52:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6y03wScz4Ly4; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199176; 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=950e7v2xLxEqWYF/1/r4UbslKMKuUanyv5ajRT2XiEs=; b=NfU3TVM9KwtkeAyXhYBNaE6JVsPzpfzmWaWLjAEu+1LYwc80eu5PXEFVHWTRMdldu5notF jltWbQdlVdOAIPWs4qG/J8Q2eAZ2fKcpvtdX0J1+oL8v7kW6vtS+MFPnbZwY4UT5RAfNXg gXJCv3BtXlKtGZB0rePwDAlVQ7mMhqmp6bAQZKzubwLuEnc1wi7xmd4Te3edcFg3AAyBBq Kqq4tAVG4S6nglm8sIDnDCWkoJjyj57jYzKOcMs2m0OFXqPdDvCGyjchbTooFQ7q1xwGNN CNDPu6PA+vNV7w69bXIpJ4VebgSns/HOHeAGiWd8kVVe8Dna/6u2D7Mqbm3vNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199176; 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=950e7v2xLxEqWYF/1/r4UbslKMKuUanyv5ajRT2XiEs=; b=Wg2tr/HkqpZhSTd+qBrVM4JlRfuYXro2Huqq4j5JVNMno4Aov0mbDILFXrTsvvsPKBUfvE T2x0THd6hAsB1IIoym+rcB6OaEl3CJ7Wg31oRzfz+XK/VigsRkG6OZT3SyD9mod9DBMrgY j7LcN4N+yAhJC6n8x4rsuD5sE+bbjc+QXbsNY/g9hey1SvdRQeQx/TGsA8hYWf7BgKgWMZ gXOgp4q7LS6eoDZC5mtatlXkhkfZWV0XF6YnCAMXaQXPBSfLbTrnGhcbm2gh4CszrqyHJx OEBCTsacVl5CHYg2YbwKDDp9iFqaBuE4nizgls8wtuOcE40PGxi2hKpq7pchdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199176; a=rsa-sha256; cv=none; b=qxqcG7xtGyJIOKsUoeQqUU52TPUxGbRgx5CpyD8QeVkO4hS95YperqfdrWWadOuF3Z7eKY OxKDUnUBSWml89CwnxLtkQGp9C6uWowt85bokrwkRzszDAFwKpS8d8TdNjSb5d7yf9DqUq 5ncHg+SZgaHzzZ5KYgjW/QyjKDE5AjuJw5howhN47WIVt43qz5Y7cJYuwd0qnOVtpDjO3f PD6W0dZCHBk6DlK5xYcNPTYdLLDU/3W9XOLBv8Wvb7wLDYB66vvJ7OrgAebVq1ffwakGZ8 xLRjpxoUplf4uYLxepxvLuFYZDRZShHk7TRrax12EFY2QQGcAuv5WIDweF8SZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys6y033mDzXWt; Mon, 10 Feb 2025 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEquZZ028437; Mon, 10 Feb 2025 14:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEquc2028433; Mon, 10 Feb 2025 14:52:56 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:56 GMT Message-Id: <202502101452.51AEquc2028433@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: 787787fa8938 - stable/14 - iwlwifi: module correct -DCONFIG_* 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 787787fa89381015693acb5ae2a34a7c6e892261 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=787787fa89381015693acb5ae2a34a7c6e892261 commit 787787fa89381015693acb5ae2a34a7c6e892261 Author: Bjoern A. Zeeb AuthorDate: 2025-01-25 12:47:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:11 +0000 iwlwifi: module correct -DCONFIG_* Remove the =1 from -DCONFIG_* in the conditional cases. They are not needed. Sponsored by: The FreeBSD Foundation (cherry picked from commit 411c857b4ccedd6491dff9a35e952bc49d053053) --- sys/modules/iwlwifi/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 3508f29979a8..fd11e670b540 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -32,13 +32,13 @@ SRCS+= pcie/tx-gen2.c pcie/tx.c .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= fw/debugfs.c mvm/debugfs.c mvm/debugfs-vif.c -CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS=${WITH_DEBUGFS} -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} +CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 SRCS+= mvm/d3.c -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} -CFLAGS+= -DCONFIG_PM_SLEEP=${WITH_CONFIG_PM} +CFLAGS+= -DCONFIG_PM +CFLAGS+= -DCONFIG_PM_SLEEP .endif SRCS+= iwl-devtrace.c