lkml.org 
[lkml]   [2010]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[032/197] iwlwifi: counting number of tfds can be free for 4965
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

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

    From: Wey-Yi Guy <wey-yi.w.guy@intel.com>

    commit be6b38bcb175613f239e0b302607db346472c6b6 upstream.

    Forget one hunk in 4965 during "iwlwifi: error checking for number of tfds
    in queue" patch.

    Reported-by: Shanyu Zhao <shanyu.zhao@intel.com>
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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

    --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
    @@ -2161,16 +2161,14 @@ static void iwl4965_rx_reply_tx(struct i
    tx_resp->failure_frame);

    freed = iwl_tx_queue_reclaim(priv, txq_id, index);
    - if (qc && likely(sta_id != IWL_INVALID_STATION))
    - priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
    + iwl_free_tfds_in_queue(priv, sta_id, tid, freed);

    if (priv->mac80211_registered &&
    (iwl_queue_space(&txq->q) > txq->q.low_mark))
    iwl_wake_queue(priv, txq_id);
    }

    - if (qc && likely(sta_id != IWL_INVALID_STATION))
    - iwl_txq_check_empty(priv, sta_id, tid, txq_id);
    + iwl_txq_check_empty(priv, sta_id, tid, txq_id);

    if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
    IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");



    \
     
     \ /
      Last update: 2010-04-22 21:31    [W:0.021 / U:63.456 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site