aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-28 13:21:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-11-10 15:10:17 -0500
commita57a59f247b651e8ed6d3eeb7e2f9d83b83134c9 (patch)
treeb283875a57203461d9278e32ae9233687415c960 /drivers/net/wireless/iwlwifi/iwl-scan.c
parent430cfe95a401baa0dc2022deaad02cb75d63c73c (diff)
iwlwifi: remove implicit direct scan
When an undirected scan is requested and iwlwifi is not associated but the user has set an SSID (and maybe was associated with that network at some point) then iwlwifi will assume the user wanted to scan for this SSID which seems wrong. Remove this code. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c7
1 files changed, 0 insertions, 7 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 }