Search Linux Wireless

[PATCH 13/16] iwlwifi: mvm: remove pointless scan plan checks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Johannes Berg <johannes.berg@xxxxxxxxx>

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@xxxxxxxxx>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index a8e11cc..0e9d28c 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,
 	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);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux