aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx5/mlx5_flow.c
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@gmail.com>2017-11-16 13:26:40 +0000
committerLuca Boccassi <luca.boccassi@gmail.com>2017-11-16 13:27:33 +0000
commit1f8d7bdaca90ffce7a23570d64a73332536ac0a3 (patch)
tree7a9d90751d0b148272d9ce355b35696c0e60d630 /drivers/net/mlx5/mlx5_flow.c
parent073e12d0c6f521c9f2753ec06132e74c69270269 (diff)
parent169a9de21e263aa6599cdc2d87a45ae158d9f509 (diff)
Merge branch 'upstream' into 17.11.x
Change-Id: I7c5a806f100bfa4324e17c91490e952762a30ee4 Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/mlx5/mlx5_flow.c')
-rw-r--r--drivers/net/mlx5/mlx5_flow.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 3df8fba4..f32dfdd3 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1930,6 +1930,7 @@ priv_flow_create(struct priv *priv,
flow->queues = (uint16_t (*)[])(flow + 1);
memcpy(flow->queues, parser.queues, parser.queues_n * sizeof(uint16_t));
flow->queues_n = parser.queues_n;
+ flow->mark = parser.mark;
/* Copy RSS configuration. */
flow->rss_conf = parser.rss_conf;
flow->rss_conf.rss_key = flow->rss_key;
@@ -2915,8 +2916,8 @@ priv_fdir_filter_delete(struct priv *priv,
if (memcmp(spec, flow_spec,
RTE_MIN(attr_h->size, flow_h->size)))
goto wrong_flow;
- spec = (void *)((uintptr_t)attr + attr_h->size);
- flow_spec = (void *)((uintptr_t)flow_attr +
+ spec = (void *)((uintptr_t)spec + attr_h->size);
+ flow_spec = (void *)((uintptr_t)flow_spec +
flow_h->size);
}
/* At this point, the flow match. */