diff mbox

[net-next,2/2] iwlwifi: mvm: Fix the build of mvm/phy-ctxt.c with debugfs disabled

Message ID 8761ad7cts.fsf_-_@x220.int.ebiederm.org (mailing list archive)
State Rejected
Delegated to: Kalle Valo
Headers show

Commit Message

Eric W. Biederman March 7, 2015, 2:37 a.m. UTC
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 mbox

Patch

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));
 }