rpms/kernel/F-7 kernel-2.6.spec, 1.3174, 1.3175 linux-2.6-iwlwifi-sw-scan-default.patch, 1.1, NONE

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30499

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-iwlwifi-sw-scan-default.patch 
Log Message:
undo change that made iwl3945 default to sw scan


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3174
retrieving revision 1.3175
diff -u -r1.3174 -r1.3175
--- kernel-2.6.spec	18 May 2007 19:53:57 -0000	1.3174
+++ kernel-2.6.spec	21 May 2007 14:00:08 -0000	1.3175
@@ -625,9 +625,8 @@
 Patch2304: linux-2.6-iwlwifi-preferred_rate_control.patch
 Patch2305: linux-2.6-iwlwifi-irq_tasklet.patch
 Patch2306: linux-2.6-mac80211-fixes.patch
-Patch2307: linux-2.6-iwlwifi-sw-scan-default.patch
-Patch2308: linux-2.6-mac80211-scan-optimizations.patch
-Patch2309: linux-2.6-bcm43xx-mac80211-fixes.patch
+Patch2307: linux-2.6-mac80211-scan-optimizations.patch
+Patch2308: linux-2.6-bcm43xx-mac80211-fixes.patch
 
 # Assorted dyntick/clock/timer fixes.
 Patch2400: linux-2.6-highres-dyntick-avoid-xtime-lock-contention.patch
@@ -1412,12 +1411,10 @@
 %patch2305 -p1
 # some mac80211 bug fixes (defrag mem leak, reassoc failure handling)
 %patch2306 -p1
-# iwl3945: default to sw scan
-%patch2307 -p1
 # mac80211: improve scan performance
-%patch2308 -p1
+%patch2307 -p1
 # bcm43xx-mac80211: important phy and ssb bus fixes
-%patch2309 -p1
+%patch2308 -p1
 
 # Assorted dyntick/clock/timer fixes.
 %patch2400 -p1
@@ -2406,6 +2403,9 @@
 %endif
 
 %changelog
+* Mon May 21 2007 John W. Linville <linville at redhat.com>
+- revert "iwl3945 default to using software scan"
+
 * Fri May 18 2007 Dave Jones <davej at redhat.com>
 - Re-add cond_resched to invalidate_mapping_pages()
 


--- linux-2.6-iwlwifi-sw-scan-default.patch DELETED ---