From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 436C4A0542 for ; Fri, 7 Feb 2020 16:14:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A47D1C11E; Fri, 7 Feb 2020 16:14:18 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 1AF0E1C02E for ; Fri, 7 Feb 2020 16:14:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VhA6z81UTc7o0fVrpoBvk0AK+EeJyQjOy3I/o9OmcQw=; b=MRFD7hC6GlnvuDMgxLBl/aaAf8JvmKRADqVyKmGrcf+mXWyHhuThCFv96H0gDOoQDUAKkc RXmklU4L22hTXLQYQYx1FuH5F5VOetE+FGgPgoS4CwsXnyGbhiwQ5HjGmW1mAXq1CZFCPf 1U3rsCE5f+ns1GgE16A0RYNJd86OrvI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-VgvbJbD7OrOjCX89Vzarnw-1; Fri, 07 Feb 2020 10:13:58 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19C0B800E21; Fri, 7 Feb 2020 15:13:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E60510016DA; Fri, 7 Feb 2020 15:13:55 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Carolyn Wyborny , Qi Zhang , Beilei Xing , dpdk stable Date: Fri, 7 Feb 2020 15:12:41 +0000 Message-Id: <20200207151248.29804-29-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: VgvbJbD7OrOjCX89Vzarnw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/i40e/base: fix error message' has been queued to LTS release 18.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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 rebasi= ng (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/e69485f94d039d83ee= cc2c2ba07991bc5ab852d7 Thanks. Kevin. --- >From e69485f94d039d83eecc2c2ba07991bc5ab852d7 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:17 +0800 Subject: [PATCH] net/i40e/base: fix error message [ upstream commit 4b3da9415941050ab01ebafbdf9bcd9c3937fd95 ] This patch changes an error code for an admin queue head overrun to use I40E_ERR_ADMIN_QUEUE_FULL instead of I40E_ERR_QUEUE_EMPTY. Fixes: 8db9e2a1b232 ("i40e: base driver") Signed-off-by: Carolyn Wyborny Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_adminq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i4= 0e_adminq.c index 38214a3731..b2fc6f5900 100644 --- a/drivers/net/i40e/base/i40e_adminq.c +++ b/drivers/net/i40e/base/i40e_adminq.c @@ -836,5 +836,5 @@ enum i40e_status_code i40e_asq_send_command(struct i40e= _hw *hw, =09=09i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, =09=09=09 "AQTX: head overrun at %d\n", val); -=09=09status =3D I40E_ERR_QUEUE_EMPTY; +=09=09status =3D I40E_ERR_ADMIN_QUEUE_FULL; =09=09goto asq_send_command_error; =09} --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:19.034919110 +0000 +++ 0029-net-i40e-base-fix-error-message.patch=092020-02-07 15:08:17.554062= 418 +0000 @@ -1 +1 @@ -From 4b3da9415941050ab01ebafbdf9bcd9c3937fd95 Mon Sep 17 00:00:00 2001 +From e69485f94d039d83eecc2c2ba07991bc5ab852d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b3da9415941050ab01ebafbdf9bcd9c3937fd95 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org