From b5dd03ebe81451117f6f48471d51e75d19c33c6b Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Fri, 20 Jul 2007 21:19:43 -0700 Subject: [PATCH] --- yaml --- r: 62751 b: refs/heads/master c: 0981582dbfae86ba0306406f1af329bb702752d2 h: refs/heads/master i: 62749: 2f7842760e5587081343301118b1721b462f8842 62747: 01f05d11ed00cc9a77b63f02800743fac5803e97 62743: 29371db392e5bbceec19619aa9b567bc2379eb38 62735: 66ecdbd6d4a8665a4981ba96e6a5f1e82ca42000 62719: 464389687b05252a018566d5267b55c9b1668385 v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/cmd.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e8e530b97ed..13c06193ae5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1f74958dbd19f6a837d887ed416688c063af529 +refs/heads/master: 0981582dbfae86ba0306406f1af329bb702752d2 diff --git a/trunk/drivers/net/mlx4/cmd.c b/trunk/drivers/net/mlx4/cmd.c index c1f81a993f5d..a9f31753661a 100644 --- a/trunk/drivers/net/mlx4/cmd.c +++ b/trunk/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; - complete(&context->done); } @@ -264,6 +262,7 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param, spin_lock(&cmd->context_lock); BUG_ON(cmd->free_head < 0); context = &cmd->context[cmd->free_head]; + context->token += cmd->token_mask + 1; cmd->free_head = context->next; spin_unlock(&cmd->context_lock);