lkml.org 
[lkml]   [2010]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[26/34] iwlwifi: clear all the stop_queue flag after load firmware
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

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

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

    commit a9e10fb9b1c6ad16e73cf2656951fce3a817611e upstream.

    All the queues are awake and ready to use after loading firmware,
    for firmware reload case, if any queues was stopped before
    reload, mac80211 will wake those queues after restart hardware, so make
    sure all the flag used to keep track of the queue status are
    reset correctly.

    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>

    --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
    @@ -581,6 +581,11 @@ static int iwl4965_alive_notify(struct iwl_priv *priv)

    iwl4965_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);

    + /* make sure all queue are not stopped */
    + memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));
    + for (i = 0; i < 4; i++)
    + atomic_set(&priv->queue_stop_count[i], 0);
    +
    /* reset to 0 to enable all the queue first */
    priv->txq_ctx_active_msk = 0;
    /* Map each Tx/cmd queue to its corresponding fifo */
    diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
    index a7fa1ad..94fc836 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-5000.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
    @@ -648,6 +648,11 @@ int iwl5000_alive_notify(struct iwl_priv *priv)

    iwl5000_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);

    + /* make sure all queue are not stopped */
    + memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));
    + for (i = 0; i < 4; i++)
    + atomic_set(&priv->queue_stop_count[i], 0);
    +
    /* reset to 0 to enable all the queue first */
    priv->txq_ctx_active_msk = 0;
    /* map qos queues to fifos one-to-one */



    \
     
     \ /
      Last update: 2010-05-25 01:13    [W:2.327 / U:0.740 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site