aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-09-11 06:07:21 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-10-25 07:45:07 -0400
commitc8f423159e3e53d30e5b36a455797ee2072b09d0 (patch)
treeffcbb3d26fc9ce34db712ff84c381e7aa07fa8b2
parent46eebec9794e47ebad0352285db50a10de595bb5 (diff)
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: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index a8e11ccb8dc1..0e9d28c23023 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -819,16 +819,9 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
819 ssid_bitmap <<= 1; 819 ssid_bitmap <<= 1;
820 820
821 for (i = 0; i < params->n_scan_plans; i++) { 821 for (i = 0; i < params->n_scan_plans; i++) {
822 struct wiphy *wiphy = mvm->hw->wiphy;
823 struct cfg80211_sched_scan_plan *scan_plan = 822 struct cfg80211_sched_scan_plan *scan_plan =
824 &params->scan_plans[i]; 823 &params->scan_plans[i];
825 824
826 if (WARN_ON(scan_plan->iterations >
827 wiphy->max_sched_scan_plan_iterations ||
828 scan_plan->interval >
829 wiphy->max_sched_scan_plan_interval))
830 return -EINVAL;
831
832 cmd->schedule[i].delay = 825 cmd->schedule[i].delay =
833 cpu_to_le16(scan_plan->interval); 826 cpu_to_le16(scan_plan->interval);
834 cmd->schedule[i].iterations = scan_plan->iterations; 827 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,
1103 params->n_channels, ssid_bitmap, cmd); 1096 params->n_channels, ssid_bitmap, cmd);
1104 1097
1105 for (i = 0; i < params->n_scan_plans; i++) { 1098 for (i = 0; i < params->n_scan_plans; i++) {
1106 struct wiphy *wiphy = mvm->hw->wiphy;
1107 struct cfg80211_sched_scan_plan *scan_plan = 1099 struct cfg80211_sched_scan_plan *scan_plan =
1108 &params->scan_plans[i]; 1100 &params->scan_plans[i];
1109 1101
1110 if (WARN_ON(scan_plan->iterations >
1111 wiphy->max_sched_scan_plan_iterations ||
1112 scan_plan->interval >
1113 wiphy->max_sched_scan_plan_interval))
1114 return -EINVAL;
1115
1116 sec_part->schedule[i].iter_count = scan_plan->iterations; 1102 sec_part->schedule[i].iter_count = scan_plan->iterations;
1117 sec_part->schedule[i].interval = 1103 sec_part->schedule[i].interval =
1118 cpu_to_le16(scan_plan->interval); 1104 cpu_to_le16(scan_plan->interval);