From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 060A21B51D for ; Fri, 23 Nov 2018 11:30:30 +0100 (CET) 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 6F3D23084243; Fri, 23 Nov 2018 10:30:29 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 252A418526; Fri, 23 Nov 2018 10:30:27 +0000 (UTC) From: Kevin Traynor To: Ori Kam Cc: dpdk stable Date: Fri, 23 Nov 2018 10:26:58 +0000 Message-Id: <20181123102713.17309-54-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-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.40]); Fri, 23 Nov 2018 10:30:29 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/flow_filtering: remove VLAN item' has been queued to stable release 18.08.1 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, 23 Nov 2018 10:30:30 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/29/18. 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. Kevin Traynor --- >>From f3024a9af4d1a2242ff75032181a6c0c7f5a2874 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 4da459285..bae711699 100644 --- a/examples/flow_filtering/flow_blocks.c +++ b/examples/flow_filtering/flow_blocks.c @@ -47,6 +47,4 @@ generate_ipv4_flow(uint16_t port_id, uint16_t 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; @@ -85,15 +83,4 @@ generate_ipv4_flow(uint16_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). @@ -107,10 +94,10 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q, 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); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:55.653991899 +0000 +++ 0054-examples-flow_filtering-remove-VLAN-item.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,13 +1,14 @@ -From 9af4eb5657107b05b0e06141291b7c6e6162bb36 Mon Sep 17 00:00:00 2001 +From f3024a9af4d1a2242ff75032181a6c0c7f5a2874 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 ---