iwlwifi: mvm: remove stray nd_config element

When the netdetect debugfs entry was removed, the nd_config element
was accidentally left in the iwl_mvm structure.  Remove it.

Fixes: dbb04b0d29f8 ("iwlwifi: mvm: remove netdetect debugfs entry")
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 76c20025a13d49e43bd79f75ee017381dc2f49c9..7bb5496405813ac2554beee15dc0a1fa9fc8eb75 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -1057,13 +1057,13 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
 
        if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT) {
                /* if we're not associated, this must be netdetect */
-               if (!wowlan->nd_config && !mvm->nd_config) {
+               if (!wowlan->nd_config) {
                        ret = 1;
                        goto out_noreset;
                }
 
                ret = iwl_mvm_netdetect_config(
-                       mvm, wowlan, wowlan->nd_config ?: mvm->nd_config, vif);
+                       mvm, wowlan, wowlan->nd_config, vif);
                if (ret)
                        goto out;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 897d06f898964e679ef745f51cfa37e23c608780..ff32f3604bc005059b95dcb306696cd11cb556d9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -732,7 +732,6 @@ struct iwl_mvm {
        int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
 
        /* sched scan settings for net detect */
-       struct cfg80211_sched_scan_request *nd_config;
        struct ieee80211_scan_ies nd_ies;
        struct cfg80211_match_set *nd_match_sets;
        int n_nd_match_sets;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 1646cddadbd826b20fba2812b353871455a57945..926492832be781bfc256812b18bef7c0a36f8d07 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -642,12 +642,6 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
 
 #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_IWLWIFI_DEBUGFS)
        kfree(mvm->d3_resume_sram);
-       if (mvm->nd_config) {
-               kfree(mvm->nd_config->match_sets);
-               kfree(mvm->nd_config->scan_plans);
-               kfree(mvm->nd_config);
-               mvm->nd_config = NULL;
-       }
 #endif
 
        iwl_trans_op_mode_leave(mvm->trans);