rpms/kernel/F-8 linux-2.6-ath5k-fixes.patch, NONE, 1.1 kernel.spec, 1.229, 1.230

[John W. Linville (linville)]

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ath5k-fixes.patch 
Log Message:
ath5k fix to avoid oops on driver load w/ unknown/unsupported cards

linux-2.6-ath5k-fixes.patch:

--- NEW FILE linux-2.6-ath5k-fixes.patch ---
diff -up linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c
--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c.orig	2007-10-17 14:35:44.000000000 -0400
+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c	2007-10-17 14:35:35.000000000 -0400
@@ -667,6 +667,8 @@ int ath5k_hw_reset(struct ath_hw *hal, e
 				/*Get rate table for this operation mode*/
 				rt = ath5k_hw_get_rate_table(hal,
 						MODE_IEEE80211B);
+				if (!rt)
+					return -EINVAL;
 
 				/*Write rate duration table*/
 				for (i = 0; i < rt->rate_count; i++) {
@@ -692,6 +694,8 @@ int ath5k_hw_reset(struct ath_hw *hal, e
 				rt = ath5k_hw_get_rate_table(hal,
 				    channel->val & CHANNEL_TURBO ?
 				    MODE_ATHEROS_TURBO : MODE_ATHEROS_TURBOG);
+				if (!rt)
+					return -EINVAL;
 
 				/* 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,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- kernel.spec	17 Oct 2007 17:32:39 -0000	1.229
+++ kernel.spec	17 Oct 2007 18:49:00 -0000	1.230
@@ -638,8 +638,9 @@
 Patch683: linux-2.6-mac80211-nm-hidden-ssid.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
-Patch692: linux-2.6-zd1211rw-mac80211.patch
-Patch693: linux-2.6-mac80211-extras.patch
+Patch693: linux-2.6-ath5k-fixes.patch
+Patch693: linux-2.6-zd1211rw-mac80211.patch
+Patch694: linux-2.6-mac80211-extras.patch
 Patch700: linux-2.6-bcm43xx-pci-neuter.patch
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
@@ -1172,6 +1173,7 @@
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 ApplyPatch linux-2.6-ath5k.patch
+ApplyPatch linux-2.6-ath5k-fixes.patch
 ApplyPatch linux-2.6-zd1211rw-mac80211.patch
 ApplyPatch linux-2.6-mac80211-extras.patch
 
@@ -1849,6 +1851,9 @@
 
 
 %changelog
+* Wed Oct 17 2007 John W. Linville <linville at redhat.com>
+- ath5k fix to avoid oops on driver load w/ unknown/unsupported cards
+
 * Wed Oct 17 2007 Dave Jones <davej at redhat.com>
 - Update highres timers patch to 2.6.23-hrt3.