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 C90BFA05D3 for ; Thu, 25 Apr 2019 17:42:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFDD31B5FD; Thu, 25 Apr 2019 17:42:15 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2A79B1B5FD for ; Thu, 25 Apr 2019 17:42:13 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9019B1219B3; Thu, 25 Apr 2019 15:42:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C1025DE87; Thu, 25 Apr 2019 15:42:11 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Thu, 25 Apr 2019 16:40:33 +0100 Message-Id: <20190425154037.28778-58-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 25 Apr 2019 15:42:12 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix errno typos in comments' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/01/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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 4c7720f50a1dabf2f370a63cc27a3a63de08446e Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Sun, 31 Mar 2019 12:02:41 +0300 Subject: [PATCH] net/mlx5: fix errno typos in comments [ upstream commit de90612f4061a1bd538ad894f1ed18bcf11d335b ] Correct typing mistake in several locations: ernno ==> errno Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function") Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_flow.c | 14 +++++++------- drivers/net/mlx5/mlx5_flow_dv.c | 6 +++--- drivers/net/mlx5/mlx5_flow_verbs.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5bf7d7ba4..15302533d 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -787,5 +787,5 @@ mlx5_flow_validate_action_mark(const struct rte_flow_action *action, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int @@ -830,5 +830,5 @@ mlx5_flow_validate_action_drop(uint64_t action_flags, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int @@ -880,5 +880,5 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int @@ -965,5 +965,5 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ int @@ -1777,5 +1777,5 @@ flow_get_drv_type(struct rte_eth_dev *dev, const struct rte_flow_attr *attr) * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ static inline int @@ -1816,5 +1816,5 @@ flow_drv_validate(struct rte_eth_dev *dev, * * @return - * Pointer to device flow on success, otherwise NULL and rte_ernno is set. + * Pointer to device flow on success, otherwise NULL and rte_errno is set. */ static inline struct mlx5_flow * @@ -1860,5 +1860,5 @@ flow_drv_prepare(const struct rte_flow *flow, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ static inline int diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index be4578d21..d34c11152 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -765,5 +765,5 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int @@ -1044,5 +1044,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, * @return * Pointer to mlx5_flow object on success, - * otherwise NULL and rte_ernno is set. + * otherwise NULL and rte_errno is set. */ static struct mlx5_flow * @@ -1874,5 +1874,5 @@ flow_dv_matcher_register(struct rte_eth_dev *dev, * * @return - * 0 on success, a negative errno value otherwise and rte_ernno is set. + * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index a7b3f9342..aef855f24 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -1384,5 +1384,5 @@ flow_verbs_prepare(const struct rte_flow_attr *attr __rte_unused, * * @return - * 0 on success, else a negative errno value otherwise and rte_ernno is set. + * 0 on success, else a negative errno value otherwise and rte_errno is set. */ static int -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:49.241170879 +0100 +++ 0058-net-mlx5-fix-errno-typos-in-comments.patch 2019-04-25 16:37:46.779294171 +0100 @@ -1 +1 @@ -From de90612f4061a1bd538ad894f1ed18bcf11d335b Mon Sep 17 00:00:00 2001 +From 4c7720f50a1dabf2f370a63cc27a3a63de08446e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit de90612f4061a1bd538ad894f1ed18bcf11d335b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index d09fdff4e..bc6a7c1eb 100644 +index 5bf7d7ba4..15302533d 100644 @@ -24 +25 @@ -@@ -789,5 +789,5 @@ mlx5_flow_validate_action_mark(const struct rte_flow_action *action, +@@ -787,5 +787,5 @@ mlx5_flow_validate_action_mark(const struct rte_flow_action *action, @@ -31 +32 @@ -@@ -832,5 +832,5 @@ mlx5_flow_validate_action_drop(uint64_t action_flags, +@@ -830,5 +830,5 @@ mlx5_flow_validate_action_drop(uint64_t action_flags, @@ -38 +39 @@ -@@ -886,5 +886,5 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action, +@@ -880,5 +880,5 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action, @@ -45 +46 @@ -@@ -979,5 +979,5 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action, +@@ -965,5 +965,5 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action, @@ -52 +53 @@ -@@ -1801,5 +1801,5 @@ flow_get_drv_type(struct rte_eth_dev *dev, const struct rte_flow_attr *attr) +@@ -1777,5 +1777,5 @@ flow_get_drv_type(struct rte_eth_dev *dev, const struct rte_flow_attr *attr) @@ -59 +60 @@ -@@ -1840,5 +1840,5 @@ flow_drv_validate(struct rte_eth_dev *dev, +@@ -1816,5 +1816,5 @@ flow_drv_validate(struct rte_eth_dev *dev, @@ -66 +67 @@ -@@ -1884,5 +1884,5 @@ flow_drv_prepare(const struct rte_flow *flow, +@@ -1860,5 +1860,5 @@ flow_drv_prepare(const struct rte_flow *flow, @@ -74 +75 @@ -index 57847fb8d..966dad983 100644 +index be4578d21..d34c11152 100644 @@ -77 +78 @@ -@@ -1632,5 +1632,5 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev, +@@ -765,5 +765,5 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev, @@ -84 +85 @@ -@@ -1992,5 +1992,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -1044,5 +1044,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -91 +92 @@ -@@ -2845,5 +2845,5 @@ flow_dv_translate_source_vport(void *matcher, void *key, +@@ -1874,5 +1874,5 @@ flow_dv_matcher_register(struct rte_eth_dev *dev, @@ -99 +100 @@ -index ef447528d..49dd13e6d 100644 +index a7b3f9342..aef855f24 100644 @@ -102 +103 @@ -@@ -1386,5 +1386,5 @@ flow_verbs_prepare(const struct rte_flow_attr *attr __rte_unused, +@@ -1384,5 +1384,5 @@ flow_verbs_prepare(const struct rte_flow_attr *attr __rte_unused,