From: Shahaf Shuler <shahafs@mellanox.com>
To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com,
yskoh@mellanox.com
Cc: dev@dpdk.org, xuemingl@mellanox.com
Subject: [dpdk-dev] [PATCH] net/mlx5: fix compilation without tunnel RSS support
Date: Sun, 13 May 2018 11:07:46 +0300 [thread overview]
Message-ID: <20180513080746.91199-1-shahafs@mellanox.com> (raw)
IBV_RX_HASH_INNER should be referenced only when having tunnel support
in the Verbs headers.
Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump")
Cc: xuemingl@mellanox.com
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
drivers/net/mlx5/mlx5_flow.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index ec6d00f21b..04ace3ee79 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2188,7 +2188,12 @@ mlx5_flow_dump(struct rte_eth_dev *dev __rte_unused,
uint16_t j;
char buf[256];
uint8_t off;
+ uint64_t extra_hash_fields = 0;
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+ if (flow->tunnel && flow->rss_conf.level > 1)
+ extra_hash_fields = (uint32_t)IBV_RX_HASH_INNER;
+#endif
spec_ptr = (uintptr_t)(flow->frxq[hrxq_idx].ibv_attr + 1);
for (j = 0, off = 0; j < flow->frxq[hrxq_idx].ibv_attr->num_of_specs;
j++) {
@@ -2205,9 +2210,7 @@ mlx5_flow_dump(struct rte_eth_dev *dev __rte_unused,
(void *)flow->frxq[hrxq_idx].hrxq,
(void *)flow->frxq[hrxq_idx].hrxq->qp,
(void *)flow->frxq[hrxq_idx].hrxq->ind_table,
- flow->frxq[hrxq_idx].hash_fields |
- (flow->tunnel &&
- flow->rss_conf.level > 1 ? (uint32_t)IBV_RX_HASH_INNER : 0),
+ (flow->frxq[hrxq_idx].hash_fields | extra_hash_fields),
flow->rss_conf.queue_num,
flow->frxq[hrxq_idx].ibv_attr->num_of_specs,
flow->frxq[hrxq_idx].ibv_attr->size,
--
2.12.0
next reply other threads:[~2018-05-13 8:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-13 8:07 Shahaf Shuler [this message]
2018-05-13 13:27 ` Xueming(Steven) Li
2018-05-14 6:00 ` Shahaf Shuler
2018-05-15 12:30 ` Shahaf Shuler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180513080746.91199-1-shahafs@mellanox.com \
--to=shahafs@mellanox.com \
--cc=adrien.mazarguil@6wind.com \
--cc=dev@dpdk.org \
--cc=nelio.laranjeiro@6wind.com \
--cc=xuemingl@mellanox.com \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).