net/mlx5: fix build without tunnel RSS support
authorShahaf Shuler <shahafs@mellanox.com>
Sun, 13 May 2018 08:07:46 +0000 (11:07 +0300)
committerFerruh Yigit <ferruh.yigit@intel.com>
Thu, 17 May 2018 10:31:42 +0000 (12:31 +0200)
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")

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
drivers/net/mlx5/mlx5_flow.c

index 3af9524..0c0d6f9 100644 (file)
@@ -2335,7 +2335,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++) {
@@ -2352,9 +2357,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,