From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>
Date: Tue, 28 Feb 2017 09:20:01 +0000 (+0100)
Subject: net/mlx5: fix flow mark action handling
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=c9c2a965ab83ca224663abe5ce38f774a081e83e;p=dpdk.git

net/mlx5: fix flow mark action handling

Mark value is always reported even when not requested or invalid.

Fixes: ea3bc3b1df94 ("net/mlx5: support mark flow action")
Cc: stable@dpdk.org

Reported-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 25059c9ddf..b0551cccf6 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -1507,7 +1507,7 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
 			}
 			if (rxq->mark &&
 			    ((cqe->sop_drop_qpn !=
-			      htonl(MLX5_FLOW_MARK_INVALID)) ||
+			      htonl(MLX5_FLOW_MARK_INVALID)) &&
 			     (cqe->sop_drop_qpn !=
 			      htonl(MLX5_FLOW_MARK_DEFAULT)))) {
 				pkt->hash.fdir.hi =