From patchwork Thu Apr 2 14:07:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 457679 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B4F2D14007F for ; Fri, 3 Apr 2015 01:08:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753551AbbDBOIQ (ORCPT ); Thu, 2 Apr 2015 10:08:16 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:33493 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343AbbDBOIG (ORCPT ); Thu, 2 Apr 2015 10:08:06 -0400 Received: by wixm2 with SMTP id m2so56729267wix.0 for ; Thu, 02 Apr 2015 07:08:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1OtqMH30czeDlcBgsqsPmnaiHlvctlJ4SpgX4hs975w=; b=Svxjlwxl10Yw6f9o2NAvUEnqUMhqg+5gXFfVjl3uw7wOZA1SzgnTYGavT2msjt8Oiv x75hpkS+D9evstFJlXdREdpwcXIe9Lk9o/DwTokVxEAWEdsb5CPGUvLQRRaWzmWQ7JO/ 8Dp5ePqBhbTXeFiKhhJj3FkwNzBAqoIFObYc30l22bZX9o7Tk2qt/noW+HMnyXS6bxqd JLClh+uxc29cji8s1RNLpjJ4q0tGhnUTvEMJOhYUY2PP2KSRDQEf9xUC0/iolmKq89B5 MoW9eDzQERid169L287JPchCOc04BMjKc1QqN38aOyeG3Lg0WCQTAaGQvrs/o/HlD7GI X7Qw== X-Gm-Message-State: ALoCoQkCbKkSrfPD+V4/7soDSV384iXpi3VDv+avbAFXRDQfc+jffBNRh2PaSvxKmtfhvaiFtcFz X-Received: by 10.180.206.98 with SMTP id ln2mr24725594wic.94.1427983685534; Thu, 02 Apr 2015 07:08:05 -0700 (PDT) Received: from localhost ([193.47.165.251]) by mx.google.com with ESMTPSA id nb4sm7421987wjc.20.2015.04.02.07.08.04 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 02 Apr 2015 07:08:05 -0700 (PDT) From: Eli Cohen X-Google-Original-From: Eli Cohen To: davem@davemloft.net Cc: netdev@vger.kernel.org, idos@mellaox.com, amirv@mellanox.com, Achiad Shochat , Saeed Mahameed , Eli Cohen Subject: [PATCH net-next 10/16] net/mlx5_core: Fix a bug in alloc_token Date: Thu, 2 Apr 2015 17:07:28 +0300 Message-Id: <1427983654-971-11-git-send-email-eli@mellanox.com> X-Mailer: git-send-email 2.3.1 In-Reply-To: <1427983654-971-1-git-send-email-eli@mellanox.com> References: <1427983654-971-1-git-send-email-eli@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Achiad Shochat In alloc_token(), the token '1' would be allocated twice consecutively. Signed-off-by: Achiad Shochat Signed-off-by: Saeed Mahameed Signed-off-by: Eli Cohen --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 0d862696b876..697d538163f2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -125,7 +125,10 @@ static u8 alloc_token(struct mlx5_cmd *cmd) u8 token; spin_lock(&cmd->token_lock); - token = cmd->token++ % 255 + 1; + cmd->token++; + if (cmd->token == 0) + cmd->token++; + token = cmd->token; spin_unlock(&cmd->token_lock); return token;