rpms/kernel/F-10 linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch, NONE, 1.1 kernel.spec, 1.1210, 1.1211

[John W. Linville]

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch 
Log Message:
ath5k: ignore the return value of ath5k_hw_noise_floor_calibration

linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch:

--- NEW FILE linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch ---
commit 8b0162a3dc5c30e862b7a73da29e32de3170f5e4
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Mon Nov 3 11:27:38 2008 +0100

    ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
    
    Noise floor calibration occasionally fails on Atheros hardware.
    This is not fatal and can happen if there's simply too much
    noise on the air. Ignoring the calibration error is the right
    thing to do here, because when the error is ignored, the hardware
    will still work, whereas if the error causes the driver to bail out
    of a bigger configuration function and does not configure the tx
    queues or the IMR (as is the case in reset.c), the hw no longer
    works properly until the next reset.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
index 69625bf..7ba18e0 100644
--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -2196,9 +2196,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
 		return ret;
 	}
 
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Re-enable RX/TX and beacons
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index b51bc03..5003263 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -842,9 +842,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
 	 *
 	 * XXX: Find an interval that's OK for all cards...
 	 */
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Reset queues and start beacon timers at the end of the reset routine


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1210
retrieving revision 1.1211
diff -u -r1.1210 -r1.1211
--- kernel.spec	13 Jan 2009 15:30:14 -0000	1.1210
+++ kernel.spec	13 Jan 2009 20:52:22 -0000	1.1211
@@ -629,6 +629,7 @@
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
+Patch681: linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
 
 Patch690: linux-2.6-at76.patch
 
@@ -1151,6 +1152,9 @@
 # iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
 ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
+# ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+ApplyPatch linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1773,6 +1777,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 13 2009 John W. Linville <linville at redhat.com>
+- ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - oops, turn off debug builds...