[dpdk-stable] patch 'doc: fix typos in the flow API guide' has been queued to LTS release 17.11.5

[Yongseok Koh <yskoh@mellanox.com>]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 9cfb2de4c699594fe2add9b96128e1f2c75e03f0 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets@samsung.com>
Date: Wed, 26 Sep 2018 17:37:46 +0300
Subject: [PATCH] doc: fix typos in the flow API guide

[ upstream commit 293a649c639aa2b5fe15a9e180eb0b3fb566ff46 ]

Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/howto/rte_flow.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index 62cac45e6..cc55413f1 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -63,7 +63,7 @@ Code
   struct rte_flow_attr attr = { .ingress = 1 };
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
-  struct rte_flow_item_etc eth;
+  struct rte_flow_item_eth eth;
   struct rte_flow_item_vlan vlan;
   struct rte_flow_item_ipv4 ipv4;
   struct rte_flow *flow;
@@ -83,7 +83,7 @@ Code
   pattern[2].spec = &ipv4;
 
   /* end the pattern array */
-  pattern[3].type = RTE_FLOW_ITEM)TYPE_END;
+  pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
@@ -158,7 +158,7 @@ Code
   struct rte_flow_attr attr = {.ingress = 1};
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
-  struct rte_flow_item_etc eth;
+  struct rte_flow_item_eth eth;
   struct rte_flow_item_vlan vlan;
   struct rte_flow_item_ipv4 ipv4;
   struct rte_flow_item_ipv4 ipv4_mask;
@@ -181,7 +181,7 @@ Code
   pattern[2].mask = &ipv4_mask;
 
   /* end the pattern array */
-  pattern[3].type = RTE_FLOW_ITEM)TYPE_END;
+  pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
@@ -258,7 +258,7 @@ Code
   struct rte_flow_attr attr = { .ingress = 1 };
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
-  struct rte_flow_item_etc eth;
+  struct rte_flow_item_eth eth;
   struct rte_flow_item_vlan vlan;
   struct rte_flow_action_queue queue = { .index = 3 };
   struct rte_flow *flow;
@@ -274,7 +274,7 @@ Code
   pattern[1].spec = &vlan;
 
   /* end the pattern array */
-  pattern[2].type = RTE_FLOW_ITEM)TYPE_END;
+  pattern[2].type = RTE_FLOW_ITEM_TYPE_END;
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.270729220 -0800
+++ 0007-doc-fix-typos-in-the-flow-API-guide.patch	2019-01-11 02:29:10.714970000 -0800
@@ -1,10 +1,11 @@
-From 293a649c639aa2b5fe15a9e180eb0b3fb566ff46 Mon Sep 17 00:00:00 2001
+From 9cfb2de4c699594fe2add9b96128e1f2c75e03f0 Mon Sep 17 00:00:00 2001
 From: Ilya Maximets <i.maximets@samsung.com>
 Date: Wed, 26 Sep 2018 17:37:46 +0300
 Subject: [PATCH] doc: fix typos in the flow API guide
 
+[ upstream commit 293a649c639aa2b5fe15a9e180eb0b3fb566ff46 ]
+
 Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")
-Cc: stable@dpdk.org
 
 Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
@@ -13,10 +14,10 @@
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
-index c71152161..6a8534d98 100644
+index 62cac45e6..cc55413f1 100644
 --- a/doc/guides/howto/rte_flow.rst
 +++ b/doc/guides/howto/rte_flow.rst
-@@ -35,7 +35,7 @@ Code
+@@ -63,7 +63,7 @@ Code
    struct rte_flow_attr attr = { .ingress = 1 };
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
@@ -25,7 +26,7 @@
    struct rte_flow_item_vlan vlan;
    struct rte_flow_item_ipv4 ipv4;
    struct rte_flow *flow;
-@@ -55,7 +55,7 @@ Code
+@@ -83,7 +83,7 @@ Code
    pattern[2].spec = &ipv4;
  
    /* end the pattern array */
@@ -34,7 +35,7 @@
  
    /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
-@@ -130,7 +130,7 @@ Code
+@@ -158,7 +158,7 @@ Code
    struct rte_flow_attr attr = {.ingress = 1};
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
@@ -43,7 +44,7 @@
    struct rte_flow_item_vlan vlan;
    struct rte_flow_item_ipv4 ipv4;
    struct rte_flow_item_ipv4 ipv4_mask;
-@@ -153,7 +153,7 @@ Code
+@@ -181,7 +181,7 @@ Code
    pattern[2].mask = &ipv4_mask;
  
    /* end the pattern array */
@@ -52,7 +53,7 @@
  
    /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
-@@ -230,7 +230,7 @@ Code
+@@ -258,7 +258,7 @@ Code
    struct rte_flow_attr attr = { .ingress = 1 };
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
@@ -61,14 +62,14 @@
    struct rte_flow_item_vlan vlan;
    struct rte_flow_action_queue queue = { .index = 3 };
    struct rte_flow *flow;
-@@ -246,7 +246,7 @@ Code
+@@ -274,7 +274,7 @@ Code
    pattern[1].spec = &vlan;
  
    /* end the pattern array */
 -  pattern[2].type = RTE_FLOW_ITEM)TYPE_END;
 +  pattern[2].type = RTE_FLOW_ITEM_TYPE_END;
  
-   /* create the queue action */
+   /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
 -- 
 2.11.0