1 diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
2 index e8d0cd51..a0c01adb 100755
3 --- a/linux_dpdk/ws_main.py
4 +++ b/linux_dpdk/ws_main.py
5 @@ -209,7 +209,7 @@ def check_ofed(ctx):
11 if not os.path.isfile(ofed_info):
12 ctx.end_msg('not found', 'YELLOW')
14 @@ -1552,8 +1552,6 @@ class build_option:
15 flags += ['-DNDEBUG'];
17 flags += ['-UNDEBUG'];
19 - flags += ['-DHAVE_IBV_MLX4_WQE_LSO_SEG=1']
22 def get_bnxt_flags(self):
23 diff --git a/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h b/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h
24 index b3d68683..35474409 100644
25 --- a/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h
26 +++ b/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h
28 -#ifndef HAVE_IBV_MLX4_WQE_LSO_SEG
29 -#define HAVE_IBV_MLX4_WQE_LSO_SEG
31 +/* HAVE_IBV_MLX4_BUF_ALLOCATORS is not defined. */
33 +/* HAVE_IBV_MLX4_UAR_MMAP_OFFSET is not defined. */
35 +/* HAVE_IBV_MLX4_WQE_LSO_SEG is not defined. */
37 diff --git a/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h b/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h
38 index 8770fdde..75db5ae8 100644
39 --- a/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h
40 +++ b/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h
42 -#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
43 -#define HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
45 +/* HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT is not defined. */
47 -#ifndef HAVE_IBV_FLOW_DV_SUPPORT
48 -#define HAVE_IBV_FLOW_DV_SUPPORT
50 +#ifndef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
51 +#define HAVE_IBV_DEVICE_TUNNEL_SUPPORT 1
52 +#endif /* HAVE_IBV_DEVICE_TUNNEL_SUPPORT */
54 -#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45
55 -#define HAVE_IBV_DEVICE_COUNTERS_SET_V45
57 +/* HAVE_IBV_DEVICE_MPLS_SUPPORT is not defined. */
59 -#ifndef HAVE_IBV_FLOW_DEVX_COUNTERS
60 -#define HAVE_IBV_FLOW_DEVX_COUNTERS
62 +#ifndef HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING
63 +#define HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING 1
64 +#endif /* HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING */
66 -#ifndef HAVE_IBV_MLX4_WQE_LSO_SEG
67 -#define HAVE_IBV_MLX4_WQE_LSO_SEG
69 +/* HAVE_IBV_WQ_FLAG_RX_END_PADDING is not defined. */
71 +#ifndef HAVE_IBV_MLX5_MOD_SWP
72 +#define HAVE_IBV_MLX5_MOD_SWP 1
73 +#endif /* HAVE_IBV_MLX5_MOD_SWP */
75 -#ifdef SUPPORTED_40000baseKR4_Full
76 +#ifndef HAVE_IBV_MLX5_MOD_MPW
77 +#define HAVE_IBV_MLX5_MOD_MPW 1
78 +#endif /* HAVE_IBV_MLX5_MOD_MPW */
80 +#ifndef HAVE_IBV_MLX5_MOD_CQE_128B_COMP
81 +#define HAVE_IBV_MLX5_MOD_CQE_128B_COMP 1
82 +#endif /* HAVE_IBV_MLX5_MOD_CQE_128B_COMP */
84 +#ifndef HAVE_IBV_MLX5_MOD_CQE_128B_PAD
85 +#define HAVE_IBV_MLX5_MOD_CQE_128B_PAD 1
86 +#endif /* HAVE_IBV_MLX5_MOD_CQE_128B_PAD */
88 +/* HAVE_IBV_FLOW_DV_SUPPORT is not defined. */
90 +/* HAVE_MLX5DV_DR is not defined. */
92 +/* HAVE_MLX5DV_DR_ESWITCH is not defined. */
94 +/* HAVE_IBV_DEVX_OBJ is not defined. */
96 +/* HAVE_IBV_FLOW_DEVX_COUNTERS is not defined. */
98 +#ifndef HAVE_ETHTOOL_LINK_MODE_25G
99 +#define HAVE_ETHTOOL_LINK_MODE_25G 1
100 +#endif /* HAVE_ETHTOOL_LINK_MODE_25G */
102 +#ifndef HAVE_ETHTOOL_LINK_MODE_50G
103 +#define HAVE_ETHTOOL_LINK_MODE_50G 1
104 +#endif /* HAVE_ETHTOOL_LINK_MODE_50G */
106 +#ifndef HAVE_ETHTOOL_LINK_MODE_100G
107 +#define HAVE_ETHTOOL_LINK_MODE_100G 1
108 +#endif /* HAVE_ETHTOOL_LINK_MODE_100G */
110 +/* HAVE_IBV_DEVICE_COUNTERS_SET_V42 is not defined. */
112 +/* HAVE_IBV_DEVICE_COUNTERS_SET_V45 is not defined. */
114 +#ifndef HAVE_RDMA_NL_NLDEV
115 +#define HAVE_RDMA_NL_NLDEV 1
116 +#endif /* HAVE_RDMA_NL_NLDEV */
118 +#ifndef HAVE_RDMA_NLDEV_CMD_GET
119 +#define HAVE_RDMA_NLDEV_CMD_GET 1
120 +#endif /* HAVE_RDMA_NLDEV_CMD_GET */
122 +#ifndef HAVE_RDMA_NLDEV_CMD_PORT_GET
123 +#define HAVE_RDMA_NLDEV_CMD_PORT_GET 1
124 +#endif /* HAVE_RDMA_NLDEV_CMD_PORT_GET */
126 +#ifndef HAVE_RDMA_NLDEV_ATTR_DEV_INDEX
127 +#define HAVE_RDMA_NLDEV_ATTR_DEV_INDEX 1
128 +#endif /* HAVE_RDMA_NLDEV_ATTR_DEV_INDEX */
130 +#ifndef HAVE_RDMA_NLDEV_ATTR_DEV_NAME
131 +#define HAVE_RDMA_NLDEV_ATTR_DEV_NAME 1
132 +#endif /* HAVE_RDMA_NLDEV_ATTR_DEV_NAME */
134 +#ifndef HAVE_RDMA_NLDEV_ATTR_PORT_INDEX
135 +#define HAVE_RDMA_NLDEV_ATTR_PORT_INDEX 1
136 +#endif /* HAVE_RDMA_NLDEV_ATTR_PORT_INDEX */
138 +/* HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX is not defined. */
140 +#ifndef HAVE_IFLA_NUM_VF
141 +#define HAVE_IFLA_NUM_VF 1
142 +#endif /* HAVE_IFLA_NUM_VF */
144 +#ifndef HAVE_IFLA_EXT_MASK
145 +#define HAVE_IFLA_EXT_MASK 1
146 +#endif /* HAVE_IFLA_EXT_MASK */
148 +#ifndef HAVE_IFLA_PHYS_SWITCH_ID
149 +#define HAVE_IFLA_PHYS_SWITCH_ID 1
150 +#endif /* HAVE_IFLA_PHYS_SWITCH_ID */
152 +#ifndef HAVE_IFLA_PHYS_PORT_NAME
153 +#define HAVE_IFLA_PHYS_PORT_NAME 1
154 +#endif /* HAVE_IFLA_PHYS_PORT_NAME */
156 +#ifndef HAVE_IFLA_VXLAN_COLLECT_METADATA
157 +#define HAVE_IFLA_VXLAN_COLLECT_METADATA 1
158 +#endif /* HAVE_IFLA_VXLAN_COLLECT_METADATA */
160 +#ifndef HAVE_TCA_CHAIN
161 +#define HAVE_TCA_CHAIN 1
162 +#endif /* HAVE_TCA_CHAIN */
164 +#ifndef HAVE_TCA_FLOWER_ACT
165 +#define HAVE_TCA_FLOWER_ACT 1
166 +#endif /* HAVE_TCA_FLOWER_ACT */
168 +#ifndef HAVE_TCA_FLOWER_FLAGS
169 +#define HAVE_TCA_FLOWER_FLAGS 1
170 +#endif /* HAVE_TCA_FLOWER_FLAGS */
172 +#ifndef HAVE_TCA_FLOWER_KEY_ETH_TYPE
173 +#define HAVE_TCA_FLOWER_KEY_ETH_TYPE 1
174 +#endif /* HAVE_TCA_FLOWER_KEY_ETH_TYPE */
176 +#ifndef HAVE_TCA_FLOWER_KEY_ETH_DST
177 +#define HAVE_TCA_FLOWER_KEY_ETH_DST 1
178 +#endif /* HAVE_TCA_FLOWER_KEY_ETH_DST */
180 +#ifndef HAVE_TCA_FLOWER_KEY_ETH_DST_MASK
181 +#define HAVE_TCA_FLOWER_KEY_ETH_DST_MASK 1
182 +#endif /* HAVE_TCA_FLOWER_KEY_ETH_DST_MASK */
184 +#ifndef HAVE_TCA_FLOWER_KEY_ETH_SRC
185 +#define HAVE_TCA_FLOWER_KEY_ETH_SRC 1
186 +#endif /* HAVE_TCA_FLOWER_KEY_ETH_SRC */
188 +#ifndef HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK
189 +#define HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK 1
190 +#endif /* HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK */
192 +#ifndef HAVE_TCA_FLOWER_KEY_IP_PROTO
193 +#define HAVE_TCA_FLOWER_KEY_IP_PROTO 1
194 +#endif /* HAVE_TCA_FLOWER_KEY_IP_PROTO */
196 +#ifndef HAVE_TCA_FLOWER_KEY_IPV4_SRC
197 +#define HAVE_TCA_FLOWER_KEY_IPV4_SRC 1
198 +#endif /* HAVE_TCA_FLOWER_KEY_IPV4_SRC */
200 +#ifndef HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK
201 +#define HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK 1
202 +#endif /* HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK */
204 +#ifndef HAVE_TCA_FLOWER_KEY_IPV4_DST
205 +#define HAVE_TCA_FLOWER_KEY_IPV4_DST 1
206 +#endif /* HAVE_TCA_FLOWER_KEY_IPV4_DST */
208 +#ifndef HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK
209 +#define HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK 1
210 +#endif /* HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK */
212 +#ifndef HAVE_TCA_FLOWER_KEY_IPV6_SRC
213 +#define HAVE_TCA_FLOWER_KEY_IPV6_SRC 1
214 +#endif /* HAVE_TCA_FLOWER_KEY_IPV6_SRC */
216 +#ifndef HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK
217 +#define HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK 1
218 +#endif /* HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK */
220 +#ifndef HAVE_TCA_FLOWER_KEY_IPV6_DST
221 +#define HAVE_TCA_FLOWER_KEY_IPV6_DST 1
222 +#endif /* HAVE_TCA_FLOWER_KEY_IPV6_DST */
224 +#ifndef HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK
225 +#define HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK 1
226 +#endif /* HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK */
228 +#ifndef HAVE_TCA_FLOWER_KEY_TCP_SRC
229 +#define HAVE_TCA_FLOWER_KEY_TCP_SRC 1
230 +#endif /* HAVE_TCA_FLOWER_KEY_TCP_SRC */
232 +#ifndef HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK
233 +#define HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK 1
234 +#endif /* HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK */
236 +#ifndef HAVE_TCA_FLOWER_KEY_TCP_DST
237 +#define HAVE_TCA_FLOWER_KEY_TCP_DST 1
238 +#endif /* HAVE_TCA_FLOWER_KEY_TCP_DST */
240 +#ifndef HAVE_TCA_FLOWER_KEY_TCP_DST_MASK
241 +#define HAVE_TCA_FLOWER_KEY_TCP_DST_MASK 1
242 +#endif /* HAVE_TCA_FLOWER_KEY_TCP_DST_MASK */
244 +#ifndef HAVE_TCA_FLOWER_KEY_UDP_SRC
245 +#define HAVE_TCA_FLOWER_KEY_UDP_SRC 1
246 +#endif /* HAVE_TCA_FLOWER_KEY_UDP_SRC */
248 +#ifndef HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK
249 +#define HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK 1
250 +#endif /* HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK */
252 +#ifndef HAVE_TCA_FLOWER_KEY_UDP_DST
253 +#define HAVE_TCA_FLOWER_KEY_UDP_DST 1
254 +#endif /* HAVE_TCA_FLOWER_KEY_UDP_DST */
256 +#ifndef HAVE_TCA_FLOWER_KEY_UDP_DST_MASK
257 +#define HAVE_TCA_FLOWER_KEY_UDP_DST_MASK 1
258 +#endif /* HAVE_TCA_FLOWER_KEY_UDP_DST_MASK */
260 +#ifndef HAVE_TCA_FLOWER_KEY_VLAN_ID
261 +#define HAVE_TCA_FLOWER_KEY_VLAN_ID 1
262 +#endif /* HAVE_TCA_FLOWER_KEY_VLAN_ID */
264 +#ifndef HAVE_TCA_FLOWER_KEY_VLAN_PRIO
265 +#define HAVE_TCA_FLOWER_KEY_VLAN_PRIO 1
266 +#endif /* HAVE_TCA_FLOWER_KEY_VLAN_PRIO */
268 +#ifndef HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE
269 +#define HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE 1
270 +#endif /* HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE */
272 +#ifndef HAVE_TCA_FLOWER_KEY_TCP_FLAGS
273 +#define HAVE_TCA_FLOWER_KEY_TCP_FLAGS 1
274 +#endif /* HAVE_TCA_FLOWER_KEY_TCP_FLAGS */
276 +#ifndef HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK
277 +#define HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK 1
278 +#endif /* HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK */
280 +#ifndef HAVE_TCA_FLOWER_KEY_IP_TOS
281 +#define HAVE_TCA_FLOWER_KEY_IP_TOS 1
282 +#endif /* HAVE_TCA_FLOWER_KEY_IP_TOS */
284 +#ifndef HAVE_TCA_FLOWER_KEY_IP_TOS_MASK
285 +#define HAVE_TCA_FLOWER_KEY_IP_TOS_MASK 1
286 +#endif /* HAVE_TCA_FLOWER_KEY_IP_TOS_MASK */
288 +#ifndef HAVE_TCA_FLOWER_KEY_IP_TTL
289 +#define HAVE_TCA_FLOWER_KEY_IP_TTL 1
290 +#endif /* HAVE_TCA_FLOWER_KEY_IP_TTL */
292 +#ifndef HAVE_TCA_FLOWER_KEY_IP_TTL_MASK
293 +#define HAVE_TCA_FLOWER_KEY_IP_TTL_MASK 1
294 +#endif /* HAVE_TCA_FLOWER_KEY_IP_TTL_MASK */
296 +#ifndef HAVE_TC_ACT_GOTO_CHAIN
297 +#define HAVE_TC_ACT_GOTO_CHAIN 1
298 +#endif /* HAVE_TC_ACT_GOTO_CHAIN */
300 +#ifndef HAVE_TC_ACT_VLAN
301 +#define HAVE_TC_ACT_VLAN 1
302 +#endif /* HAVE_TC_ACT_VLAN */
304 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_KEY_ID
305 +#define HAVE_TCA_FLOWER_KEY_ENC_KEY_ID 1
306 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_KEY_ID */
308 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC
309 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC 1
310 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC */
312 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK
313 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK 1
314 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK */
316 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST
317 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST 1
318 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST */
320 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK
321 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK 1
322 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK */
324 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC
325 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC 1
326 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC */
328 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK
329 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK 1
330 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK */
332 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST
333 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST 1
334 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST */
336 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK
337 +#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK 1
338 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK */
340 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT
341 +#define HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT 1
342 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT */
344 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK
345 +#define HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK 1
346 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK */
348 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT
349 +#define HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT 1
350 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT */
352 +#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK
353 +#define HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK 1
354 +#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK */
356 +/* HAVE_TCA_FLOWER_KEY_ENC_IP_TOS is not defined. */
358 +/* HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK is not defined. */
360 +/* HAVE_TCA_FLOWER_KEY_ENC_IP_TTL is not defined. */
362 +/* HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK is not defined. */
364 +#ifndef HAVE_TC_ACT_TUNNEL_KEY
365 +#define HAVE_TC_ACT_TUNNEL_KEY 1
366 +#endif /* HAVE_TC_ACT_TUNNEL_KEY */
368 +#ifndef HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT
369 +#define HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT 1
370 +#endif /* HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT */
372 +/* HAVE_TCA_TUNNEL_KEY_ENC_TOS is not defined. */
374 +/* HAVE_TCA_TUNNEL_KEY_ENC_TTL is not defined. */
376 +#ifndef HAVE_TCA_TUNNEL_KEY_NO_CSUM
377 +#define HAVE_TCA_TUNNEL_KEY_NO_CSUM 1
378 +#endif /* HAVE_TCA_TUNNEL_KEY_NO_CSUM */
380 +#ifndef HAVE_TC_ACT_PEDIT
381 +#define HAVE_TC_ACT_PEDIT 1
382 +#endif /* HAVE_TC_ACT_PEDIT */
384 +#ifndef HAVE_SUPPORTED_40000baseKR4_Full
385 #define HAVE_SUPPORTED_40000baseKR4_Full 1
387 +#endif /* HAVE_SUPPORTED_40000baseKR4_Full */
389 -#ifdef SUPPORTED_40000baseCR4_Full
390 +#ifndef HAVE_SUPPORTED_40000baseCR4_Full
391 #define HAVE_SUPPORTED_40000baseCR4_Full 1
393 +#endif /* HAVE_SUPPORTED_40000baseCR4_Full */
395 -#ifdef SUPPORTED_40000baseSR4_Full
396 +#ifndef HAVE_SUPPORTED_40000baseSR4_Full
397 #define HAVE_SUPPORTED_40000baseSR4_Full 1
399 +#endif /* HAVE_SUPPORTED_40000baseSR4_Full */
401 -#ifdef SUPPORTED_40000baseLR4_Full
402 +#ifndef HAVE_SUPPORTED_40000baseLR4_Full
403 #define HAVE_SUPPORTED_40000baseLR4_Full 1
405 +#endif /* HAVE_SUPPORTED_40000baseLR4_Full */
407 -#ifdef SUPPORTED_56000baseKR4_Full
408 +#ifndef HAVE_SUPPORTED_56000baseKR4_Full
409 #define HAVE_SUPPORTED_56000baseKR4_Full 1
411 +#endif /* HAVE_SUPPORTED_56000baseKR4_Full */
413 -#ifdef SUPPORTED_56000baseCR4_Full
414 +#ifndef HAVE_SUPPORTED_56000baseCR4_Full
415 #define HAVE_SUPPORTED_56000baseCR4_Full 1
417 +#endif /* HAVE_SUPPORTED_56000baseCR4_Full */
419 -#ifdef SUPPORTED_56000baseSR4_Full
420 +#ifndef HAVE_SUPPORTED_56000baseSR4_Full
421 #define HAVE_SUPPORTED_56000baseSR4_Full 1
423 +#endif /* HAVE_SUPPORTED_56000baseSR4_Full */
425 -#ifdef SUPPORTED_56000baseLR4_Full
426 +#ifndef HAVE_SUPPORTED_56000baseLR4_Full
427 #define HAVE_SUPPORTED_56000baseLR4_Full 1
429 +#endif /* HAVE_SUPPORTED_56000baseLR4_Full */
431 +#ifndef HAVE_STATIC_ASSERT
432 +#define HAVE_STATIC_ASSERT 1
433 +#endif /* HAVE_STATIC_ASSERT */
435 diff --git a/src/dpdk/drivers/net/tap/rte_eth_tap.c b/src/dpdk/drivers/net/tap/rte_eth_tap.c
436 index bc889c19..47a2b68f 100644
437 --- a/src/dpdk/drivers/net/tap/rte_eth_tap.c
438 +++ b/src/dpdk/drivers/net/tap/rte_eth_tap.c
441 #include <arpa/inet.h>
443 -#include <linux_tap/if_tun.h>
444 -#include <linux_tap/if_ether.h>
445 +#include <linux/if_tun.h>
446 +#include <linux/if_ether.h>
450 diff --git a/src/dpdk/drivers/net/tap/rte_eth_tap.h b/src/dpdk/drivers/net/tap/rte_eth_tap.h
451 index 66cd3441..dc3579ac 100644
452 --- a/src/dpdk/drivers/net/tap/rte_eth_tap.h
453 +++ b/src/dpdk/drivers/net/tap/rte_eth_tap.h
455 #include <inttypes.h>
458 -#include <linux_tap/if_tun.h>
459 +#include <linux/if_tun.h>
461 #include <rte_ethdev_driver.h>
462 #include <rte_ether.h>
463 diff --git a/src/dpdk/drivers/net/tap/tap_autoconf.h b/src/dpdk/drivers/net/tap/tap_autoconf.h
464 index dddd4ae6..d5880608 100644
465 --- a/src/dpdk/drivers/net/tap/tap_autoconf.h
466 +++ b/src/dpdk/drivers/net/tap/tap_autoconf.h
468 #ifndef HAVE_TC_FLOWER
469 #define HAVE_TC_FLOWER 1
471 +#endif /* HAVE_TC_FLOWER */
473 +#ifndef HAVE_TC_VLAN_ID
474 +#define HAVE_TC_VLAN_ID 1
475 +#endif /* HAVE_TC_VLAN_ID */
478 #define HAVE_TC_BPF 1
480 +#endif /* HAVE_TC_BPF */
482 -#ifndef HAVE_TC_VLAN_ID
483 -#define HAVE_TC_VLAN_ID 1
485 +#ifndef HAVE_TC_BPF_FD
486 +#define HAVE_TC_BPF_FD 1
487 +#endif /* HAVE_TC_BPF_FD */
489 +#ifndef HAVE_TC_ACT_BPF
490 +#define HAVE_TC_ACT_BPF 1
491 +#endif /* HAVE_TC_ACT_BPF */
493 +#ifndef HAVE_TC_ACT_BPF_FD
494 +#define HAVE_TC_ACT_BPF_FD 1
495 +#endif /* HAVE_TC_ACT_BPF_FD */
497 diff --git a/src/dpdk/drivers/net/tap/tap_netlink.h b/src/dpdk/drivers/net/tap/tap_netlink.h
498 index 900ce375..faa73ba1 100644
499 --- a/src/dpdk/drivers/net/tap/tap_netlink.h
500 +++ b/src/dpdk/drivers/net/tap/tap_netlink.h
504 #include <inttypes.h>
505 -#include <linux_tap/rtnetlink.h>
506 -#include <linux_tap/netlink.h>
507 +#include <linux/rtnetlink.h>
508 +#include <linux/netlink.h>
512 diff --git a/src/dpdk/drivers/net/tap/tap_tcmsgs.h b/src/dpdk/drivers/net/tap/tap_tcmsgs.h
513 index 782de540..8cedea84 100644
514 --- a/src/dpdk/drivers/net/tap/tap_tcmsgs.h
515 +++ b/src/dpdk/drivers/net/tap/tap_tcmsgs.h
517 #define _TAP_TCMSGS_H_
519 #include <tap_autoconf.h>
520 -#include <linux_tap/if_ether.h>
521 -#include <linux_tap/rtnetlink.h>
522 -#include <linux_tap/pkt_sched.h>
523 -#include <linux_tap/pkt_cls.h>
524 -#include <linux_tap/tc_act/tc_mirred.h>
525 -#include <linux_tap/tc_act/tc_gact.h>
526 -#include <linux_tap/tc_act/tc_skbedit.h>
527 +#include <linux/if_ether.h>
528 +#include <linux/rtnetlink.h>
529 +#include <linux/pkt_sched.h>
530 +#include <linux/pkt_cls.h>
531 +#include <linux/tc_act/tc_mirred.h>
532 +#include <linux/tc_act/tc_gact.h>
533 +#include <linux/tc_act/tc_skbedit.h>
534 #ifdef HAVE_TC_ACT_BPF
535 #include <linux/tc_act/tc_bpf.h>