Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5e1832 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set 



The commits below broke compilation when
CONFIG_IWLWIFI_DEBUGFS is not set.
FIx that.

Fixes: ddf89ab1 ("iwlwifi: mvm: allow to force the Rx chains from debugfs")
Fixes: 9d761fd8 ("iwlwifi: mvm: add trigger for firmware dump upon missed beacons")
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 190f1029

drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c

+0 −1
Original line number Diff line number Diff line
@@ -627,7 +627,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
		return;



	mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);

	mvmvif->mvm = mvm;



	if (!mvmvif->dbgfs_dir) {

		IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+2 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	int ret;



	mvmvif->mvm = mvm;



	/*

	 * make sure D0i3 exit is completed, otherwise a target access

	 * during tx queue configuration could be done when still in

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −1
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ struct iwl_mvm_vif_bf_data { 
 *	average signal of beacons retrieved from the firmware

 */

struct iwl_mvm_vif {

	struct iwl_mvm *mvm;

	u16 id;

	u16 color;

	u8 ap_sta_id;
@@ -418,7 +419,6 @@ struct iwl_mvm_vif { 
#endif



#ifdef CONFIG_IWLWIFI_DEBUGFS

	struct iwl_mvm *mvm;

	struct dentry *dbgfs_dir;

	struct dentry *dbgfs_slink;

	struct iwl_dbgfs_pm dbgfs_pm;

drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c

+2 −0
Original line number Diff line number Diff line
@@ -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));

}