rpms/kernel/F-12 iwlwifi-recalculate-average-tpt-if-not-current.patch, NONE, 1.1 kernel.spec, 1.2086, 1.2087

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4856

Modified Files:
	kernel.spec 
Added Files:
	iwlwifi-recalculate-average-tpt-if-not-current.patch 
Log Message:
iwlwifi: recalculate average tpt if not current (#588021)

iwlwifi-recalculate-average-tpt-if-not-current.patch:
 iwl-agn-rs.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE iwlwifi-recalculate-average-tpt-if-not-current.patch ---
Backport of the following upstream commit...

commit 3d79b2a9eeaa066b35c49fbb17e3156a3c482c3e
Author: Reinette Chatre <reinette.chatre at intel.com>
Date:   Mon May 3 10:55:07 2010 -0700

    iwlwifi: recalculate average tpt if not current
    
    We currently have this check as a BUG_ON, which is being hit by people.
    Previously it was an error with a recalculation if not current, return that
    code.
    
    The BUG_ON was introduced by:
    commit 3110bef78cb4282c58245bc8fd6d95d9ccb19749
    Author: Guy Cohen <guy.cohen at intel.com>
    Date:   Tue Sep 9 10:54:54 2008 +0800
    
        iwlwifi: Added support for 3 antennas
    
    ... the portion adding the BUG_ON is reverted since we are encountering the 
    and BUG_ON was created with assumption that error is not encountered.
    
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.32.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c.orig linux-2.6.32.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
--- linux-2.6.32.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c.orig	2010-05-25 14:25:21.000000000 -0400
+++ linux-2.6.32.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2010-05-25 14:26:45.000000000 -0400
@@ -2195,8 +2195,12 @@ static void rs_rate_scale_perform(struct
 	/* Else we have enough samples; calculate estimate of
 	 * actual average throughput */
 
-	BUG_ON(window->average_tpt != ((window->success_ratio *
-			tbl->expected_tpt[index] + 64) / 128));
+	if (window->average_tpt != ((window->success_ratio *
+			tbl->expected_tpt[index] + 64) / 128)) {
+		IWL_ERR(priv, "expected_tpt should have been calculated by now\n");
+		window->average_tpt = ((window->success_ratio *
+					tbl->expected_tpt[index] + 64) / 128);
+	}
 
 	/* If we are searching for better modulation mode, check success. */
 	if (lq_sta->search_better_tbl &&


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2086
retrieving revision 1.2087
diff -u -p -r1.2086 -r1.2087
--- kernel.spec	25 May 2010 17:35:08 -0000	1.2086
+++ kernel.spec	25 May 2010 18:38:47 -0000	1.2087
@@ -829,6 +829,9 @@ Patch12911: iwlwifi-fix-internal-scan-ra
 # iwlwifi: recover_from_tx_stall
 Patch12912: iwlwifi-recover_from_tx_stall.patch
 
+# iwlwifi: recalculate average tpt if not current
+Patch12920: iwlwifi-recalculate-average-tpt-if-not-current.patch
+
 # ==============================================================================
 %endif
 
@@ -1512,6 +1515,9 @@ ApplyPatch iwlwifi-fix-internal-scan-rac
 # iwlwifi: recover_from_tx_stall
 ApplyPatch iwlwifi-recover_from_tx_stall.patch
 
+# iwlwifi: recalculate average tpt if not current
+ApplyPatch iwlwifi-recalculate-average-tpt-if-not-current.patch
+
 # END OF PATCH APPLICATIONS ====================================================
 %endif
 
@@ -2165,6 +2171,9 @@ fi
 
 %changelog
 * Mon May 24 2010 John W. Linville <linville at redhat.com>
+- iwlwifi: recalculate average tpt if not current (#588021)
+
+* Mon May 24 2010 John W. Linville <linville at redhat.com>
 - iwlwifi: recover_from_tx_stall (#589777)
 - iwlwifi: fix scan races (#592011)
 - iwlwifi: fix internal scan race (#592011)