Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp5585682imm; Tue, 12 Jun 2018 10:01:12 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLo55lFjhapN0CrYRPhvmTMKs6QbuaycRvsfPEslwYDG15ApbFlbWAiMwDKuNti0J3TMYyc X-Received: by 2002:a17:902:8348:: with SMTP id z8-v6mr1246222pln.239.1528822872851; Tue, 12 Jun 2018 10:01:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528822872; cv=none; d=google.com; s=arc-20160816; b=drV3elmOEbsY62rJegFTpQYs7/7zAuzGb8jKIJfHqpcEErQrPzL8VthpGHk47pzRmc BoaTGZoGXr7zhpNxy8u/mL2EXAaRrRzACPrYE0HGlHkDsixDY8dYjlSAPnkOCCaIJc+l LTtd/SPN24BFtRAMwi9VGd7q/kNKtf1k4uvHORhgmDD9IqTYAJi9xzwKAj36ebK5yAIX i2t0g34frDKxwuoGLdoNJx2JXGb0axlMDvQQeuvyfzi+9TM3Ag26JztGBm0wAbQOp+/p iLwmjLShC/woUeTLY11dsR1O6Y39OmVKjJBBaB3i+v6qR7naMQOvCgHvhjvyRFn5zrl0 d1DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=OMLD1jWrjudRHyMJuIhJ7+vvLNlIbXfkwrL1WK2Bsv0=; b=UBiQAyK3hTd+sUeTMYUEIfADHjNs2CiY3AS8dYW2ivtFfkgGYVhhHh70W7jxq6nCoq cjER67wzpiGtm0F3wD96IBGYsMXPTtQbmCHPlp1wzPIuf5jPWdaFkudnIi/ITk/vSAnB A01SG+bmaU58WyMm2K5zNeb4dRqiL+L5PzjpluYfPvJ7rQFtKBdt2mZpHvvrtY3GRQc4 KtgDvaJYRGxbyWpwEhudl7r/zZiGwN7kdyuW3puimx8CIW3s2t47l1A828S4IeCzzhM0 3HPW9+lIcaz4gqtmXe+/fyHf+A3zYfvq+URrVnx4OkqbnBLv9G/LpuiOMS6Oy79ESe65 bhZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IUiYYzO3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t8-v6si550743ply.15.2018.06.12.10.00.58; Tue, 12 Jun 2018 10:01:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IUiYYzO3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933792AbeFLQ7q (ORCPT + 99 others); Tue, 12 Jun 2018 12:59:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:53258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934905AbeFLQxi (ORCPT ); Tue, 12 Jun 2018 12:53:38 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61583208B9; Tue, 12 Jun 2018 16:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1528822417; bh=aYxlI5xbVk4kZO5Zsn4UaODYNCWmWLoFSFScIb8sGl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IUiYYzO3TwCxZssIFdoc1HX0YfGRhaEhmel7lFEkaPDbOkArMuMek10YDddA7wzxJ wb7gSkSOocz5jq3vWd6ZNAdsB5YLw43CBbyDndt/Yn1we/DnYWO3QDTRTmf/vIUmIM 4VFL/Plsu5GBHlguyq3kOV8uxxt0SIzhfHTEOScI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julia Lawall , "David S. Miller" Subject: [PATCH 4.4 09/24] bnx2x: use the right constant Date: Tue, 12 Jun 2018 18:51:53 +0200 Message-Id: <20180612164817.037574260@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612164816.587001852@linuxfoundation.org> References: <20180612164816.587001852@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Julia Lawall [ Upstream commit dd612f18a49b63af8b3a5f572d999bdb197385bc ] Nearby code that also tests port suggests that the P0 constant should be used when port is zero. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression e,e1; @@ * e ? e1 : e1 // Fixes: 6c3218c6f7e5 ("bnx2x: Adjust ETS to 578xx") Signed-off-by: Julia Lawall Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c @@ -594,7 +594,7 @@ static void bnx2x_ets_e3b0_nig_disabled( * slots for the highest priority. */ REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS : - NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100); + NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100); /* Mapping between the CREDIT_WEIGHT registers and actual client * numbers */