Commit c8f42315 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: remove pointless scan plan checks 



As cfg80211 already enforces these limits, there's little point
in having them again here in our code.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 46eebec9

drivers/net/wireless/iwlwifi/mvm/scan.c

+0 −14
Original line number Diff line number Diff line
@@ -819,16 +819,9 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	ssid_bitmap <<= 1;



	for (i = 0; i < params->n_scan_plans; i++) {

		struct wiphy *wiphy = mvm->hw->wiphy;

		struct cfg80211_sched_scan_plan *scan_plan =

			&params->scan_plans[i];



		if (WARN_ON(scan_plan->iterations >

			    wiphy->max_sched_scan_plan_iterations ||

			    scan_plan->interval >

			    wiphy->max_sched_scan_plan_interval))

			return -EINVAL;



		cmd->schedule[i].delay =

			cpu_to_le16(scan_plan->interval);

		cmd->schedule[i].iterations = scan_plan->iterations;
@@ -1103,16 +1096,9 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
				       params->n_channels, ssid_bitmap, cmd);



	for (i = 0; i < params->n_scan_plans; i++) {

		struct wiphy *wiphy = mvm->hw->wiphy;

		struct cfg80211_sched_scan_plan *scan_plan =

			&params->scan_plans[i];



		if (WARN_ON(scan_plan->iterations >

			    wiphy->max_sched_scan_plan_iterations ||

			    scan_plan->interval >

			    wiphy->max_sched_scan_plan_interval))

			return -EINVAL;



		sec_part->schedule[i].iter_count = scan_plan->iterations;

		sec_part->schedule[i].interval =

			cpu_to_le16(scan_plan->interval);

CRA Git | Maintained and supported by SUSTech CRA and CCSE