aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c7
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c8
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 6c5654f70a06..c4b90301e9a1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -743,13 +743,6 @@ static void iwl_bg_request_scan(struct work_struct *data)
743 memcpy(scan->direct_scan[0].ssid, 743 memcpy(scan->direct_scan[0].ssid,
744 priv->direct_ssid, priv->direct_ssid_len); 744 priv->direct_ssid, priv->direct_ssid_len);
745 n_probes++; 745 n_probes++;
746 } else if (!iwl_is_associated(priv) && priv->essid_len) {
747 IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",
748 print_ssid(ssid, priv->essid, priv->essid_len));
749 scan->direct_scan[0].id = WLAN_EID_SSID;
750 scan->direct_scan[0].len = priv->essid_len;
751 memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
752 n_probes++;
753 } else { 746 } else {
754 IWL_DEBUG_SCAN("Start indirect scan.\n"); 747 IWL_DEBUG_SCAN("Start indirect scan.\n");
755 } 748 }
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 431bebe76c2e..bf372949747f 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6148,14 +6148,6 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
6148 memcpy(scan->direct_scan[0].ssid, 6148 memcpy(scan->direct_scan[0].ssid,
6149 priv->direct_ssid, priv->direct_ssid_len); 6149 priv->direct_ssid, priv->direct_ssid_len);
6150 n_probes++; 6150 n_probes++;
6151 } else if (!iwl3945_is_associated(priv) && priv->essid_len) {
6152 IWL_DEBUG_SCAN
6153 ("Kicking off one direct scan for '%s' when not associated\n",
6154 print_ssid(ssid, priv->essid, priv->essid_len));
6155 scan->direct_scan[0].id = WLAN_EID_SSID;
6156 scan->direct_scan[0].len = priv->essid_len;
6157 memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
6158 n_probes++;
6159 } else 6151 } else
6160 IWL_DEBUG_SCAN("Kicking off one indirect scan.\n"); 6152 IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");
6161 6153