From: ebiederm@xmission.com (Eric W. Biederman)
To: Kalle Valo <kvalo@codeaurora.org>
Cc: David Miller <davem@davemloft.net>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH net-next 2/2] iwlwifi: mvm: Fix the build of mvm/phy-ctxt.c with debugfs disabled
Date: Fri, 06 Mar 2015 20:37:03 -0600 [thread overview]
Message-ID: <8761ad7cts.fsf_-_@x220.int.ebiederm.org> (raw)
In-Reply-To: <87fv9h7cwl.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Fri, 06 Mar 2015 20:35:22 -0600")
When attempting to build my kernel I get:
CC drivers/net/wireless/iwlwifi/mvm/phy-ctxt.o
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c: In function ‘iwl_mvm_phy_ctxt_cmd_data’:
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c:178:6: error: ‘struct iwl_mvm’ has no member named ‘dbgfs_rx_phyinfo’
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c:179:23: error: ‘struct iwl_mvm’ has no member named ‘dbgfs_rx_phyinfo’
make[6]: *** [drivers/net/wireless/iwlwifi/mvm/phy-ctxt.o] Error 1
Fix it by making the new code depend on debugfs.
Fixes: ddf89ab10a93e8b iwlwifi: mvm: allow to force the Rx chains from debugfs
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index 1bd10eda01f9..192b74bc8cf6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -175,8 +175,10 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
cmd->rxchain_info |= cpu_to_le32(idle_cnt << PHY_RX_CHAIN_CNT_POS);
cmd->rxchain_info |= cpu_to_le32(active_cnt <<
PHY_RX_CHAIN_MIMO_CNT_POS);
+#ifdef CONFIG_IWLWIFI_DEBUGFS
if (unlikely(mvm->dbgfs_rx_phyinfo))
cmd->rxchain_info = cpu_to_le32(mvm->dbgfs_rx_phyinfo);
+#endif
cmd->txchain_info = cpu_to_le32(iwl_mvm_get_valid_tx_ant(mvm));
}
--
2.2.1
next prev parent reply other threads:[~2015-03-07 2:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-06 17:08 pull-request: wireless-drivers-next 2015-03-06 Kalle Valo
2015-03-06 20:46 ` David Miller
2015-03-07 7:18 ` Kalle Valo
[not found] ` <874mpy2gw5.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
2015-03-07 2:35 ` [PATCH net-next 0/2] build fixes for iwlwifi Eric W. Biederman
[not found] ` <87fv9h7cwl.fsf-JOvCrm2gF+uungPnsOpG7nhyD016LWXt@public.gmane.org>
2015-03-07 2:36 ` [PATCH 1/2] iwlwifi: mvm: Fix the build of mvm/mac-ctxt.c with debugfs disabled Eric W. Biederman
2015-03-07 2:37 ` Eric W. Biederman [this message]
2015-03-07 7:27 ` [PATCH net-next 0/2] build fixes for iwlwifi Kalle Valo
[not found] ` <87r3t11d4r.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
2015-03-07 17:48 ` Grumbach, Emmanuel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8761ad7cts.fsf_-_@x220.int.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=davem@davemloft.net \
--cc=emmanuel.grumbach@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).