iwlwifi: mvm: remove pointless scan plan checks
authorJohannes Berg <johannes.berg@intel.com>
Fri, 11 Sep 2015 10:07:21 +0000 (12:07 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 25 Oct 2015 11:45:07 +0000 (13:45 +0200)
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>
drivers/net/wireless/iwlwifi/mvm/scan.c

index a8e11ccb8dc166ec22af1f32740ad1297057086a..0e9d28c23023b23ed1ccbba7298d86f81d582111 100644 (file)
@@ -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);