[dpdk-dev] RTE_PIPELINE_ACTION_PORT_META fix for non-default entries

Message ID 1424507481-21451-1-git-send-email-imustafin@bk.ru (mailing list archive)
State Accepted, archived
Headers

Commit Message

Ильдар Мустафин Feb. 21, 2015, 8:31 a.m. UTC
  Signed-off-by: Ildar Mustafin <imustafin@bk.ru>
---
 lib/librte_pipeline/rte_pipeline.c | 5 +++++
 1 file changed, 5 insertions(+)
  

Comments

Thomas Monjalon Feb. 24, 2015, 1:01 a.m. UTC | #1
2015-02-21 11:31, Ildar Mustafin:
> Signed-off-by: Ildar Mustafin <imustafin@bk.ru>

An explanation is generally preferred.

Applied, thanks
  

Patch

diff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/librte_pipeline/rte_pipeline.c
index ac7e887..36d92c9 100644
--- a/lib/librte_pipeline/rte_pipeline.c
+++ b/lib/librte_pipeline/rte_pipeline.c
@@ -999,6 +999,7 @@  rte_pipeline_compute_masks(struct rte_pipeline *p, uint64_t pkts_mask)
 {
 	p->action_mask1[RTE_PIPELINE_ACTION_DROP] = 0;
 	p->action_mask1[RTE_PIPELINE_ACTION_PORT] = 0;
+	p->action_mask1[RTE_PIPELINE_ACTION_PORT_META] = 0;
 	p->action_mask1[RTE_PIPELINE_ACTION_TABLE] = 0;
 
 	if ((pkts_mask & (pkts_mask + 1)) == 0) {
@@ -1224,6 +1225,7 @@  rte_pipeline_run(struct rte_pipeline *p)
 		pkts_mask = RTE_LEN2MASK(n_pkts, uint64_t);
 		p->action_mask0[RTE_PIPELINE_ACTION_DROP] = 0;
 		p->action_mask0[RTE_PIPELINE_ACTION_PORT] = 0;
+		p->action_mask0[RTE_PIPELINE_ACTION_PORT_META] = 0;
 		p->action_mask0[RTE_PIPELINE_ACTION_TABLE] = 0;
 
 		/* Input port user actions */
@@ -1300,6 +1302,9 @@  rte_pipeline_run(struct rte_pipeline *p)
 				p->action_mask0[RTE_PIPELINE_ACTION_PORT] |=
 					p->action_mask1[
 						RTE_PIPELINE_ACTION_PORT];
+				p->action_mask0[RTE_PIPELINE_ACTION_PORT_META] |=
+					p->action_mask1[
+						RTE_PIPELINE_ACTION_PORT_META];
 				p->action_mask0[RTE_PIPELINE_ACTION_TABLE] |=
 					p->action_mask1[
 						RTE_PIPELINE_ACTION_TABLE];