Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a57a59f2 authored Oct 28, 2008 by Johannes Berg Committed by John W. Linville Nov 10, 2008

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>

parent 430cfe95

drivers/net/wireless/iwlwifi/iwl-scan.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -743,13 +743,6 @@ static void iwl_bg_request_scan(struct work_struct *data)
	memcpy(scan->direct_scan[0].ssid,		memcpy(scan->direct_scan[0].ssid,
	priv->direct_ssid, priv->direct_ssid_len);		priv->direct_ssid, priv->direct_ssid_len);
	n_probes++;		n_probes++;
	} else if (!iwl_is_associated(priv) && priv->essid_len) {
	IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",
	print_ssid(ssid, priv->essid, priv->essid_len));
	scan->direct_scan[0].id = WLAN_EID_SSID;
	scan->direct_scan[0].len = priv->essid_len;
	memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
	n_probes++;
	} else {		} else {
	IWL_DEBUG_SCAN("Start indirect scan.\n");		IWL_DEBUG_SCAN("Start indirect scan.\n");
	}		}

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -6148,14 +6148,6 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
	memcpy(scan->direct_scan[0].ssid,		memcpy(scan->direct_scan[0].ssid,
	priv->direct_ssid, priv->direct_ssid_len);		priv->direct_ssid, priv->direct_ssid_len);
	n_probes++;		n_probes++;
	} else if (!iwl3945_is_associated(priv) && priv->essid_len) {
	IWL_DEBUG_SCAN
	("Kicking off one direct scan for '%s' when not associated\n",
	print_ssid(ssid, priv->essid, priv->essid_len));
	scan->direct_scan[0].id = WLAN_EID_SSID;
	scan->direct_scan[0].len = priv->essid_len;
	memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);
	n_probes++;
	} else		} else
	IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");