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

Commit 566f165d authored by Luca Coelho's avatar Luca Coelho Committed by Emmanuel Grumbach
Browse files

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: dbb04b0d ("iwlwifi: mvm: remove netdetect debugfs entry")
Reported-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 48f0a038

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

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

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

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

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

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