---

yaml --- r: 62751 b: refs/heads/master c: 0981582 h: refs/heads/master i: 62749: 2f78427 62747: 01f05d1 62743: 29371db 62735: 66ecdbd 62719: 4643896 v: v3
git-mirror · Jul 21, 2007 · b5dd03e · b5dd03e
1 parent 71e14b3
commit b5dd03e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);