From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 7D1421B94E for ; Fri, 11 Jan 2019 11:31:53 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Jan 2019 12:31:49 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x0BAVjcQ018586; Fri, 11 Jan 2019 12:31:48 +0200 From: Yongseok Koh To: Ilya Maximets Cc: Ferruh Yigit , dpdk stable Date: Fri, 11 Jan 2019 02:31:25 -0800 Message-Id: <20190111103142.21088-2-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190111103142.21088-1-yskoh@mellanox.com> References: <20190111103142.21088-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'doc: fix style and syntax in flow API guide' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Fri, 11 Jan 2019 10:31:53 -0000 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 1d991d1aaca5c60fce342379f076f12feb95a837 Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Thu, 23 Aug 2018 11:05:54 +0300 Subject: [PATCH] doc: fix style and syntax in flow API guide [ upstream commit 1334586b669c1d27aec2bffd0b1ed9f542cd7d19 ] Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API") Signed-off-by: Ilya Maximets Acked-by: Ferruh Yigit --- doc/guides/howto/rte_flow.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst index 4a27c995d..62cac45e6 100644 --- a/doc/guides/howto/rte_flow.rst +++ b/doc/guides/howto/rte_flow.rst @@ -60,7 +60,7 @@ Code .. code-block:: c /* create the attribute structure */ - struct rte_flow_attr attr = {.ingress = 1}; + 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; @@ -90,8 +90,8 @@ Code actions[1].type = RTE_FLOW_ACTION_TYPE_END; /* validate and create the flow rule */ - if (!rte_flow_validate(port_id, &attr, pattern, actions, &error) - flow = rte_flow_create(port_id, &attr, pattern, actions, &error) + if (!rte_flow_validate(port_id, &attr, pattern, actions, &error)) + flow = rte_flow_create(port_id, &attr, pattern, actions, &error); Output ~~~~~~ @@ -148,7 +148,7 @@ clarity):: tpmd> flow create 0 ingress pattern eth / vlan / ipv4 dst spec 192.168.3.0 dst mask 255.255.255.0 / - end actions drop / end + end actions drop / end Code ~~~~ @@ -188,8 +188,8 @@ Code actions[1].type = RTE_FLOW_ACTION_TYPE_END; /* validate and create the flow rule */ - if (!rte_flow_validate(port_id, &attr, pattern, actions, &error) - flow = rte_flow_create(port_id, &attr, pattern, actions, &error) + if (!rte_flow_validate(port_id, &attr, pattern, actions, &error)) + flow = rte_flow_create(port_id, &attr, pattern, actions, &error); Output ~~~~~~ @@ -255,7 +255,7 @@ Code .. code-block:: c - struct rte_flow_attr attr = {.ingress = 1}; + 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; @@ -278,12 +278,12 @@ Code /* create the drop action */ actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE; - actions[0].conf = &queue + actions[0].conf = &queue; actions[1].type = RTE_FLOW_ACTION_TYPE_END; /* validate and create the flow rule */ - if (!rte_flow_validate(port_id, &attr, pattern, actions, &error) - flow = rte_flow_create(port_id, &attr, pattern, actions, &error) + if (!rte_flow_validate(port_id, &attr, pattern, actions, &error)) + flow = rte_flow_create(port_id, &attr, pattern, actions, &error); Output ~~~~~~ -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-11 02:29:10.976399520 -0800 +++ 0002-doc-fix-style-and-syntax-in-flow-API-guide.patch 2019-01-11 02:29:10.653974000 -0800 @@ -1,10 +1,11 @@ -From 1334586b669c1d27aec2bffd0b1ed9f542cd7d19 Mon Sep 17 00:00:00 2001 +From 1d991d1aaca5c60fce342379f076f12feb95a837 Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Thu, 23 Aug 2018 11:05:54 +0300 Subject: [PATCH] doc: fix style and syntax in flow API guide +[ upstream commit 1334586b669c1d27aec2bffd0b1ed9f542cd7d19 ] + Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API") -Cc: stable@dpdk.org Signed-off-by: Ilya Maximets Acked-by: Ferruh Yigit @@ -13,10 +14,10 @@ 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst -index caa4e1afd..c71152161 100644 +index 4a27c995d..62cac45e6 100644 --- a/doc/guides/howto/rte_flow.rst +++ b/doc/guides/howto/rte_flow.rst -@@ -32,7 +32,7 @@ Code +@@ -60,7 +60,7 @@ Code .. code-block:: c /* create the attribute structure */ @@ -25,7 +26,7 @@ struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW]; struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW]; struct rte_flow_item_etc eth; -@@ -62,8 +62,8 @@ Code +@@ -90,8 +90,8 @@ Code actions[1].type = RTE_FLOW_ACTION_TYPE_END; /* validate and create the flow rule */ @@ -36,7 +37,7 @@ Output ~~~~~~ -@@ -120,7 +120,7 @@ clarity):: +@@ -148,7 +148,7 @@ clarity):: tpmd> flow create 0 ingress pattern eth / vlan / ipv4 dst spec 192.168.3.0 dst mask 255.255.255.0 / @@ -45,7 +46,7 @@ Code ~~~~ -@@ -160,8 +160,8 @@ Code +@@ -188,8 +188,8 @@ Code actions[1].type = RTE_FLOW_ACTION_TYPE_END; /* validate and create the flow rule */ @@ -56,7 +57,7 @@ Output ~~~~~~ -@@ -227,7 +227,7 @@ Code +@@ -255,7 +255,7 @@ Code .. code-block:: c @@ -65,9 +66,9 @@ struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW]; struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW]; struct rte_flow_item_etc eth; -@@ -250,12 +250,12 @@ Code +@@ -278,12 +278,12 @@ Code - /* create the queue action */ + /* create the drop action */ actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE; - actions[0].conf = &queue + actions[0].conf = &queue;