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 AB19E1B937 for ; Fri, 11 Jan 2019 11:32:08 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Jan 2019 12:32:06 +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 x0BAVjca018586; Fri, 11 Jan 2019 12:32:05 +0200 From: Yongseok Koh To: Ori Kam Cc: dpdk stable Date: Fri, 11 Jan 2019 02:31:35 -0800 Message-Id: <20190111103142.21088-12-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 'examples/flow_filtering: remove VLAN item' 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:32:09 -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 e12ff9920d806030612933890c0c2441b2b11724 Mon Sep 17 00:00:00 2001 From: Ori Kam Date: Mon, 5 Nov 2018 09:35:28 +0000 Subject: [PATCH] examples/flow_filtering: remove VLAN item [ upstream commit 9af4eb5657107b05b0e06141291b7c6e6162bb36 ] Since the VLAN is not in use and some PMD can't support vlan = 0 this item was removed. Fixes: 4a3ef59a10c8 ("examples/flow_filtering: add simple demo of flow API") Signed-off-by: Ori Kam --- examples/flow_filtering/flow_blocks.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/examples/flow_filtering/flow_blocks.c b/examples/flow_filtering/flow_blocks.c index f92df1024..b71a42ff0 100644 --- a/examples/flow_filtering/flow_blocks.c +++ b/examples/flow_filtering/flow_blocks.c @@ -74,8 +74,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, struct rte_flow_action_queue queue = { .index = rx_q }; struct rte_flow_item_eth eth_spec; struct rte_flow_item_eth eth_mask; - struct rte_flow_item_vlan vlan_spec; - struct rte_flow_item_vlan vlan_mask; struct rte_flow_item_ipv4 ip_spec; struct rte_flow_item_ipv4 ip_mask; int res; @@ -113,17 +111,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, pattern[0].mask = ð_mask; /* - * setting the second level of the pattern (vlan). - * since in this example we just want to get the - * ipv4 we also set this level to allow all. - */ - memset(&vlan_spec, 0, sizeof(struct rte_flow_item_vlan)); - memset(&vlan_mask, 0, sizeof(struct rte_flow_item_vlan)); - pattern[1].type = RTE_FLOW_ITEM_TYPE_VLAN; - pattern[1].spec = &vlan_spec; - pattern[1].mask = &vlan_mask; - - /* * setting the third level of the pattern (ip). * in this example this is the level we care about * so we set it according to the parameters. @@ -134,12 +121,12 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, ip_mask.hdr.dst_addr = dest_mask; ip_spec.hdr.src_addr = htonl(src_ip); ip_mask.hdr.src_addr = src_mask; - pattern[2].type = RTE_FLOW_ITEM_TYPE_IPV4; - pattern[2].spec = &ip_spec; - pattern[2].mask = &ip_mask; + pattern[1].type = RTE_FLOW_ITEM_TYPE_IPV4; + pattern[1].spec = &ip_spec; + pattern[1].mask = &ip_mask; /* the final level must be always type end */ - pattern[3].type = RTE_FLOW_ITEM_TYPE_END; + pattern[2].type = RTE_FLOW_ITEM_TYPE_END; res = rte_flow_validate(port_id, &attr, pattern, action, error); if (!res) -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-11 02:29:11.539814726 -0800 +++ 0012-examples-flow_filtering-remove-VLAN-item.patch 2019-01-11 02:29:10.764974000 -0800 @@ -1,13 +1,14 @@ -From 9af4eb5657107b05b0e06141291b7c6e6162bb36 Mon Sep 17 00:00:00 2001 +From e12ff9920d806030612933890c0c2441b2b11724 Mon Sep 17 00:00:00 2001 From: Ori Kam Date: Mon, 5 Nov 2018 09:35:28 +0000 Subject: [PATCH] examples/flow_filtering: remove VLAN item +[ upstream commit 9af4eb5657107b05b0e06141291b7c6e6162bb36 ] + Since the VLAN is not in use and some PMD can't support vlan = 0 this item was removed. Fixes: 4a3ef59a10c8 ("examples/flow_filtering: add simple demo of flow API") -Cc: stable@dpdk.org Signed-off-by: Ori Kam --- @@ -15,10 +16,10 @@ 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/examples/flow_filtering/flow_blocks.c b/examples/flow_filtering/flow_blocks.c -index 4da459285..bae711699 100644 +index f92df1024..b71a42ff0 100644 --- a/examples/flow_filtering/flow_blocks.c +++ b/examples/flow_filtering/flow_blocks.c -@@ -46,8 +46,6 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q, +@@ -74,8 +74,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, struct rte_flow_action_queue queue = { .index = rx_q }; struct rte_flow_item_eth eth_spec; struct rte_flow_item_eth eth_mask; @@ -27,7 +28,7 @@ struct rte_flow_item_ipv4 ip_spec; struct rte_flow_item_ipv4 ip_mask; int res; -@@ -85,17 +83,6 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q, +@@ -113,17 +111,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, pattern[0].mask = ð_mask; /* @@ -45,7 +46,7 @@ * setting the third level of the pattern (ip). * in this example this is the level we care about * so we set it according to the parameters. -@@ -106,12 +93,12 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q, +@@ -134,12 +121,12 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, ip_mask.hdr.dst_addr = dest_mask; ip_spec.hdr.src_addr = htonl(src_ip); ip_mask.hdr.src_addr = src_mask;