rpms/kernel/F-9 linux-2.6-iwlwifi-remove-implicit-direct-scan.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.42, 1.891.2.43

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31105

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-iwlwifi-remove-implicit-direct-scan.patch 
Log Message:


linux-2.6-iwlwifi-remove-implicit-direct-scan.patch:

--- NEW FILE linux-2.6-iwlwifi-remove-implicit-direct-scan.patch ---
Back-port of the following upstream commit...

commit a57a59f247b651e8ed6d3eeb7e2f9d83b83134c9
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Tue Oct 28 18:21:05 2008 +0100

    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 at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-07 14:34:39.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-07 14:43:08.000000000 -0400
@@ -6202,14 +6202,6 @@ static void iwl3945_bg_request_scan(stru
 		memcpy(scan->direct_scan[0].ssid,
 		       priv->direct_ssid, priv->direct_ssid_len);
 		direct_mask = 1;
-	} else if (!iwl3945_is_associated(priv) && priv->essid_len) {
-		IWL_DEBUG_SCAN
-		  ("Kicking off one direct scan for '%s' when not associated\n",
-		   iwl3945_escape_essid(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);
-		direct_mask = 1;
 	} else {
 		IWL_DEBUG_SCAN("Kicking off one indirect scan.\n");
 		direct_mask = 0;
diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c.orig	2009-04-07 14:34:27.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl-scan.c	2009-04-07 14:42:12.000000000 -0400
@@ -804,13 +804,6 @@ static void iwl_bg_request_scan(struct w
 		memcpy(scan->direct_scan[0].ssid,
 		       priv->direct_ssid, priv->direct_ssid_len);
 		n_probes++;
-	} else if (!iwl_is_associated(priv) && priv->essid_len) {
-		IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",
-				iwl_escape_essid(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 {
 		IWL_DEBUG_SCAN("Start indirect scan.\n");
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.42
retrieving revision 1.891.2.43
diff -u -r1.891.2.42 -r1.891.2.43
--- kernel.spec	26 Mar 2009 21:41:33 -0000	1.891.2.42
+++ kernel.spec	7 Apr 2009 19:08:47 -0000	1.891.2.43
@@ -682,6 +682,7 @@
 Patch685: linux-2.6-wireless-ath9k-dma-fixes.patch
 Patch686: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch687: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch689: linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1275,6 +1276,9 @@
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 
+# iwlwifi: remove implicit direct scan
+ApplyPatch linux-2.6-iwlwifi-remove-implicit-direct-scan.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1946,6 +1950,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Apr  7 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.43
+- iwlwifi: remove implicit direct scan
+
 * Thu Mar 26 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.42
 - Next round of ext4 fixes for -stable.