Commit:     0981582dbfae86ba0306406f1af329bb702752d2
Parent:     c1f74958dbd19f6a837d887ed416688c063af529
Author:     Roland Dreier <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 21:19:43 2007 -0700
Committer:  Roland Dreier <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 21:19:43 2007 -0700

    mlx4_core: Change command token on timeout
    The FW command token is currently only updated on a command completion
    event. This means that on command timeout, the same token will be
    reused for new command, which results in a mess if the timed out
    command *does* eventually complete.
    This is the same change as the patch for mthca from Michael
    S. Tsirkin <[EMAIL PROTECTED]> that was just merged.  It seems
    sensible to avoid gratuitous differences in FW command processing
    between mthca and mlx4.
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
 drivers/net/mlx4/cmd.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c
index c1f81a9..a9f3175 100644
--- a/drivers/net/mlx4/cmd.c
+++ b/drivers/net/mlx4/cmd.c
@@ -246,8 +246,6 @@ void mlx4_cmd_event(struct mlx4_dev *dev, u16 token, u8 
status, u64 out_param)
        context->result    = mlx4_status_to_errno(status);
        context->out_param = out_param;
-       context->token += priv->cmd.token_mask + 1;
@@ -264,6 +262,7 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 
in_param, u64 *out_param,
        BUG_ON(cmd->free_head < 0);
        context = &cmd->context[cmd->free_head];
+       context->token += cmd->token_mask + 1;
        cmd->free_head = context->next;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to