lkml.org 
[lkml]   [2010]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[163/200] iwlwifi: recalculate average tpt if not current
    2.6.34-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Reinette Chatre <reinette.chatre@intel.com>

    commit 3d79b2a9eeaa066b35c49fbb17e3156a3c482c3e upstream.

    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@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 error
    and BUG_ON was created with assumption that error is not encountered.

    Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
    @@ -2077,10 +2077,12 @@ static void rs_rate_scale_perform(struct
    }
    /* Else we have enough samples; calculate estimate of
    * actual average throughput */
    -
    - /* Sanity-check TPT calculations */
    - 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 &&



    \
     
     \ /
      Last update: 2010-07-01 23:21    [W:4.032 / U:2.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site