iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() [Linux 5.1]

iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() [Linux 5.1]

This Linux kernel change "iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register()" is included in the Linux 5.1 release. This change is authored by Luca Coelho <luciano.coelho [at] intel.com> on Thu Apr 25 10:03:34 2019 +0300. The commit for this change in Linux stable tree is d156e67 (patch).

iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register()

When I rebased Greg's patch, I accidentally left the old if block that
was already there.  Remove it.

Fixes: 154d4899e411 ("iwlwifi: mvm: properly check debugfs dentry before using it")
Signed-off-by: Luca Coelho <[email protected]>

There are 6 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
index 738eddb..6925527 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
@@ -780,12 +780,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        return;
    }

-   if (!mvmvif->dbgfs_dir) {
-       IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
-           dbgfs_dir);
-       return;
-   }
-
    if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&
        ((vif->type == NL80211_IFTYPE_STATION && !vif->p2p) ||
         (vif->type == NL80211_IFTYPE_STATION && vif->p2p)))

Leave a Reply

Your email address will not be published. Required fields are marked *