fix compilation when DEBUGFS isn't set
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJU+zjSAAoJEC0Llv5uNjIBtHgQAKAVCy4En1FeOl/XMV1xV98D 5ex+71JyAjf+08diCTMSfQoq/R73TvhWUFFWnEP5HjNitmdEy3KWliyIZ0CRG8BS Tho8YJOLvz/Hk/M5R2yulqj7dMwHcZX40Vmgt5qWNUN3AwmGilngjuDL+CwaAVhv 5w0yDj+4PDOSxR6bj0oVGCJcvJre8LqTbamRc0m/abtjpx93IbV+q/JLU79eH8Er seMsNdHw+t8D9HhNTebdmGzNnyQ64jddqCeGwp4CDYRccbvJ0nzaHidlO0iZiqnJ x+DB6q/jpXOpoIdn4UwX4ocy6YJUuqmHGZhfgd0jpULVub8zGuwNYODeafuhXd4L 8d3qJxLP7sNWpKGlwl0torcgap3+S44GEQOeCt5FL/ivAxejWHpGM4PsaI5NmPbV Ma9wZ30z9z+bVZoZ7duOAPOzjhw2Mqik4h3pRIi6Bhi7WXGNGd8hlwOGw26ICOaR CiIZBCEz+AI0x5rhAPq/tiW6xs1qCccMF70wEtSkZa+hd9DvMoGnqCqS0O+OEV3B 8vu0fP7BbAOgvKfK7iGL0QGVInL0VURkxyiHK8uKyGa/aXuVBpdB8hNirftmDLLj FmiDFIoBCvv2dr8UCc5LL1wjaOKjLOFiTDOO0ebYbhXCipgvZ1/AJOjQG2QV/+6s 1O5Ed9XTgv16ucEHu/Pd =/+gP -----END PGP SIGNATURE----- Merge tag 'iwlwifi-next-for-kalle-2015-03-07' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next fix compilation when DEBUGFS isn't set Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
57ad7a0a81
|
@ -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