From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 65277A046B for ; Mon, 24 Jun 2019 17:26:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E0881BEB7; Mon, 24 Jun 2019 17:26:26 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 5C72D1BCD4 for ; Mon, 24 Jun 2019 17:26:24 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6792D8830F; Mon, 24 Jun 2019 15:26:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51A0119723; Mon, 24 Jun 2019 15:26:16 +0000 (UTC) From: Kevin Traynor To: Lance Richardson Cc: Ajit Khaparde , dpdk stable Date: Mon, 24 Jun 2019 16:24:40 +0100 Message-Id: <20190624152525.19349-16-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 24 Jun 2019 15:26:23 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix ring type macro name' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/51a73def79f0be35bd82f0cbc36abb3aa0e67006 Thanks. Kevin Traynor --- >From 51a73def79f0be35bd82f0cbc36abb3aa0e67006 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Sun, 2 Jun 2019 13:42:37 -0400 Subject: [PATCH] net/bnxt: fix ring type macro name [ upstream commit 1f91ae985753f7f5e4170ff2f2e0b1d47d1aa5dd ] Use consistent macro names for ring type values. (There is no functional change, the "alloc" and "free" values are identical.) Fixes: 6371b91fb66d ("net/bnxt: add ring alloc/free") Signed-off-by: Lance Richardson Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 55b5e9720..5a08e9094 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1137,15 +1137,15 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp, rc = rte_le_to_cpu_16(resp->error_code); switch (ring_type) { - case HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL: + case HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL: PMD_DRV_LOG(ERR, "hwrm_ring_alloc cp failed. rc:%d\n", rc); HWRM_UNLOCK(); return rc; - case HWRM_RING_FREE_INPUT_RING_TYPE_RX: + case HWRM_RING_ALLOC_INPUT_RING_TYPE_RX: PMD_DRV_LOG(ERR, "hwrm_ring_alloc rx failed. rc:%d\n", rc); HWRM_UNLOCK(); return rc; - case HWRM_RING_FREE_INPUT_RING_TYPE_TX: + case HWRM_RING_ALLOC_INPUT_RING_TYPE_TX: PMD_DRV_LOG(ERR, "hwrm_ring_alloc tx failed. rc:%d\n", rc); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:55.919361600 +0100 +++ 0016-net-bnxt-fix-ring-type-macro-name.patch 2019-06-24 16:18:54.990432191 +0100 @@ -1 +1 @@ -From 1f91ae985753f7f5e4170ff2f2e0b1d47d1aa5dd Mon Sep 17 00:00:00 2001 +From 51a73def79f0be35bd82f0cbc36abb3aa0e67006 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1f91ae985753f7f5e4170ff2f2e0b1d47d1aa5dd ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0c6af1622..8db18ea61 100644 +index 55b5e9720..5a08e9094 100644