rpms/kernel/F-7 kernel-2.6.spec, 1.3362, 1.3363 linux-2.6-ath5k-fixes.patch, 1.1, 1.2

[John W. Linville (linville)]

Author: linville

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

Modified Files:
	kernel-2.6.spec linux-2.6-ath5k-fixes.patch 
Log Message:
remove problematic hunk from ath5k fixes patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3362
retrieving revision 1.3363
diff -u -r1.3362 -r1.3363
--- kernel-2.6.spec	22 Oct 2007 16:52:54 -0000	1.3362
+++ kernel-2.6.spec	23 Oct 2007 18:00:42 -0000	1.3363
@@ -2221,6 +2221,9 @@
 %endif
 
 %changelog
+* Tue Oct 23 2007 John W. Linville <linville at redhat.com>
+- remove problematic hunk from ath5k fixes patch
+
 * Mon Oct 22 2007 Chuck Ebbert <cebbert at redhat.com>
 - Don't create /sys/module/nousb/ (bz #242715)
 

linux-2.6-ath5k-fixes.patch:

Index: linux-2.6-ath5k-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-ath5k-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ath5k-fixes.patch	17 Oct 2007 22:20:39 -0000	1.1
+++ linux-2.6-ath5k-fixes.patch	23 Oct 2007 18:00:42 -0000	1.2
@@ -19,16 +19,3 @@
  
  				/* Write rate duration table */
  				for (i = 0; i < rt->rate_count; i++)
-diff -up linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c
---- linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig	2007-10-17 14:38:25.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c	2007-10-17 14:38:20.000000000 -0400
-@@ -1944,6 +1944,9 @@ static int ath_getchannels(struct ieee80
- 		}
- 
- 		hw_rates = ath5k_hw_get_rate_table(ah, mode->mode);
-+		if (!hw_rates)
-+			return -EINVAL;
-+
- 		mode->num_rates    = ath_copy_rates(mode->rates, hw_rates,
- 			max_r);
- 		mode->num_channels = ath_copy_channels(ah, mode->channels,