[dpdk-stable] patch 'net/mlx5: fix typos and code style' has been queued to LTS release 18.11.1

Kevin Traynor ktraynor at redhat.com
Thu Feb 7 14:25:12 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.1

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/14/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.

Thanks.

Kevin Traynor

---
>From e294ab42a60e8a385a46c595dcd885778f6ab5c7 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Date: Sat, 29 Dec 2018 19:45:12 +0000
Subject: [PATCH] net/mlx5: fix typos and code style

[ upstream commit 239810607333f7e68979781b0c7be2a14c242f6a ]

This patch fixes typos and codestyle issues in mlx5_flow_tcf.c file

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_tcf.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
index 9e5d94741..14896e64d 100644
--- a/drivers/net/mlx5/mlx5_flow_tcf.c
+++ b/drivers/net/mlx5/mlx5_flow_tcf.c
@@ -437,5 +437,5 @@ struct flow_tcf_vxlan_encap {
 		} ipv6;
 	};
-struct {
+	struct {
 		rte_be16_t src;
 		rte_be16_t dst;
@@ -1282,5 +1282,5 @@ flow_tcf_validate_vxlan_encap_ipv4(const struct rte_flow_item *item,
  *
  * @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
@@ -1368,5 +1368,5 @@ flow_tcf_validate_vxlan_encap_ipv6(const struct rte_flow_item *item,
  *
  * @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
@@ -1436,5 +1436,5 @@ flow_tcf_validate_vxlan_encap_udp(const struct rte_flow_item *item,
  *
  * @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
@@ -1484,5 +1484,5 @@ flow_tcf_validate_vxlan_encap_vni(const struct rte_flow_item *item,
  *
  * @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
@@ -1664,5 +1664,5 @@ flow_tcf_validate_vxlan_decap_udp(const struct rte_flow_item *udp,
  *
  * @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
@@ -2703,5 +2703,5 @@ flow_tcf_nl_brand(struct nlmsghdr *nlh, uint32_t handle)
  * @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 *
@@ -3078,5 +3078,5 @@ flow_tcf_vxlan_encap_parse(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.
  */
 static int
@@ -4375,6 +4375,6 @@ flow_tcf_collect_vxlan_cb(const struct nlmsghdr *nlh, void *arg)
 /**
  * Cleanup the outer interface. Removes all found vxlan devices
- * attached to specified index, flushes the meigh and local IP
- * datavase.
+ * attached to specified index, flushes the neigh and local IP
+ * database.
  *
  * @param[in] tcf
@@ -5384,5 +5384,5 @@ flow_tcf_remove(struct rte_eth_dev *dev, 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 int
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:55.645660798 +0000
+++ 0006-net-mlx5-fix-typos-and-code-style.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,8 +1,10 @@
-From 239810607333f7e68979781b0c7be2a14c242f6a Mon Sep 17 00:00:00 2001
+From e294ab42a60e8a385a46c595dcd885778f6ab5c7 Mon Sep 17 00:00:00 2001
 From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 Date: Sat, 29 Dec 2018 19:45:12 +0000
 Subject: [PATCH] net/mlx5: fix typos and code style
 
+[ upstream commit 239810607333f7e68979781b0c7be2a14c242f6a ]
+
 This patch fixes typos and codestyle issues in mlx5_flow_tcf.c file
 
 Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>


More information about the stable mailing list