Removed use of non-standard array range initialization, which is
non-standard and is not supported by MSVC.
Fixed macro mlx5_malloc_numa_tolerant: added missing backslash.
Fixed macro pool_malloc: added missing backslash and added prefix
MLX5_ to "NUMA_TOLERANT" parameter.
Signed-off-by: Andre Muezerie <andre...@linux.microsoft.com>
---
drivers/common/mlx5/mlx5_malloc.h | 4 ++--
drivers/net/mlx5/mlx5_rx.c | 4 ++--
drivers/net/mlx5/mlx5_utils.c | 4 ++--
drivers/net/octeon_ep/otx_ep_mbox.c | 24 ++++++++++++++++++++----
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_malloc.h
b/drivers/common/mlx5/mlx5_malloc.h
index 6e5cc3d851..46ea5bc8f0 100644
--- a/drivers/common/mlx5/mlx5_malloc.h
+++ b/drivers/common/mlx5/mlx5_malloc.h
@@ -118,8 +118,8 @@ void mlx5_free(void *addr);
mem; \
}))
#else
-#define mlx5_malloc_numa_tolerant(flags, size, align, socket)
- (mlx5_malloc((flags) | MLX5_NUMA_TOLERANT, (size), (align), (socket)));
+#define mlx5_malloc_numa_tolerant(flags, size, align, socket) \
+ mlx5_malloc((flags) | MLX5_NUMA_TOLERANT, (size), (align), (socket))
#endif
#ifdef __cplusplus
}
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
index 271018d6d1..420a03068d 100644
--- a/drivers/net/mlx5/mlx5_rx.c
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -1093,7 +1093,7 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts,
uint16_t pkts_n)
break;
}
pkt = seg;
- MLX5_ASSERT(len >= (rxq->crc_present << 2));
+ MLX5_ASSERT(len >= (int)(rxq->crc_present << 2));
pkt->ol_flags &= RTE_MBUF_F_EXTERNAL;
if (rxq->cqe_comp_layout && mcqe)
cqe = &rxq->title_cqe;
@@ -1273,7 +1273,7 @@ mlx5_rx_burst_out_of_order(void *dpdk_rxq, struct
rte_mbuf **pkts, uint16_t pkts
}
if (!pkt) {
pkt = seg;
- MLX5_ASSERT(len >= (rxq->crc_present << 2));
+ MLX5_ASSERT(len >= (int)(rxq->crc_present << 2));
pkt->ol_flags &= RTE_MBUF_F_EXTERNAL;
if (rxq->cqe_comp_layout && mcqe)
cqe = &rxq->title_cqe;
diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c
index fc35003a4a..cba8cc3f49 100644
--- a/drivers/net/mlx5/mlx5_utils.c
+++ b/drivers/net/mlx5/mlx5_utils.c
@@ -29,8 +29,8 @@
mem; \
}))
#else
-#define pool_malloc(pool, flags, size, align, socket)
- (pool)->cfg.malloc((uint32_t)(flags) | NUMA_TOLERANT, (size), (align),
(socket));
+#define pool_malloc(pool, flags, size, align, socket) \
+ ((pool)->cfg.malloc((uint32_t)(flags) | MLX5_NUMA_TOLERANT, (size),
(align), (socket)))
#endif
int mlx5_logtype_ipool;
diff --git a/drivers/net/octeon_ep/otx_ep_mbox.c
b/drivers/net/octeon_ep/otx_ep_mbox.c
index 1d7e08d2cc..e0fb6842e0 100644
--- a/drivers/net/octeon_ep/otx_ep_mbox.c
+++ b/drivers/net/octeon_ep/otx_ep_mbox.c
@@ -17,10 +17,26 @@
* with new command and it's version info.
*/
static uint32_t otx_ep_cmd_versions[OTX_EP_MBOX_CMD_MAX] = {
- [0 ... OTX_EP_MBOX_CMD_DEV_REMOVE] = OTX_EP_MBOX_VERSION_V1,
- [OTX_EP_MBOX_CMD_GET_FW_INFO ... OTX_EP_MBOX_NOTIF_LINK_STATUS] =
OTX_EP_MBOX_VERSION_V2,
- [OTX_EP_MBOX_NOTIF_PF_FLR] = OTX_EP_MBOX_VERSION_V3
-
+ /* [0 ... OTX_EP_MBOX_CMD_DEV_REMOVE] = OTX_EP_MBOX_VERSION_V1, */
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ OTX_EP_MBOX_VERSION_V1,
+ /* [OTX_EP_MBOX_CMD_GET_FW_INFO ... OTX_EP_MBOX_NOTIF_LINK_STATUS] =
+ * OTX_EP_MBOX_VERSION_V2,
+ */
+ OTX_EP_MBOX_VERSION_V2,
+ OTX_EP_MBOX_VERSION_V2,
+ OTX_EP_MBOX_VERSION_V2,
+ /* [OTX_EP_MBOX_NOTIF_PF_FLR] = OTX_EP_MBOX_VERSION_V3 */
+ OTX_EP_MBOX_VERSION_V3,
};
static int
--
2.50.1.vfs.0.2
