mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set
The commits below broke compilation when CONFIG_IWLWIFI_DEBUGFS is not set. FIx that. Fixes:ddf89ab10a
("iwlwifi: mvm: allow to force the Rx chains from debugfs") Fixes:9d761fd8a5
("iwlwifi: mvm: add trigger for firmware dump upon missed beacons") Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
parent
190f102975
commit
aa5e183207
4 changed files with 5 additions and 2 deletions
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue