git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/failsafe: fix RSS hash offload reporting
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_defs.h
diff --git
a/drivers/net/mlx5/mlx5_defs.h
b/drivers/net/mlx5/mlx5_defs.h
index
3c34234
..
af29d93
100644
(file)
--- a/
drivers/net/mlx5/mlx5_defs.h
+++ b/
drivers/net/mlx5/mlx5_defs.h
@@
-6,7
+6,7
@@
#ifndef RTE_PMD_MLX5_DEFS_H_
#define RTE_PMD_MLX5_DEFS_H_
#ifndef RTE_PMD_MLX5_DEFS_H_
#define RTE_PMD_MLX5_DEFS_H_
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_vxlan.h>
#include "mlx5_autoconf.h"
#include <rte_vxlan.h>
#include "mlx5_autoconf.h"
@@
-50,7
+50,7
@@
/* Switch port ID parameters for bonding configurations. */
#define MLX5_PORT_ID_BONDING_PF_MASK 0xf
/* Switch port ID parameters for bonding configurations. */
#define MLX5_PORT_ID_BONDING_PF_MASK 0xf
-#define MLX5_PORT_ID_BONDING_PF_SHIFT
0xf
+#define MLX5_PORT_ID_BONDING_PF_SHIFT
12
/* Alarm timeout. */
#define MLX5_ALARM_TIMEOUT_US 100000
/* Alarm timeout. */
#define MLX5_ALARM_TIMEOUT_US 100000
@@
-199,8
+199,11
@@
/* Maximum number of shared actions supported by rte_flow */
#define MLX5_MAX_SHARED_ACTIONS 2
/* Maximum number of shared actions supported by rte_flow */
#define MLX5_MAX_SHARED_ACTIONS 2
-/* Definition of static_assert found in /usr/include/assert.h */
-#ifndef HAVE_STATIC_ASSERT
+/*
+ * Linux definition of static_assert is found in /usr/include/assert.h.
+ * Windows does not require a redefinition.
+ */
+#if !defined(HAVE_STATIC_ASSERT) && !defined(RTE_EXEC_ENV_WINDOWS)
#define static_assert _Static_assert
#endif
#define static_assert _Static_assert
#endif