1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
|
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index e8d0cd51..a0c01adb 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -209,7 +209,7 @@ def check_ofed(ctx):
ofed_ver= 42
ofed_ver_show= '4.2'
-
+ return True
if not os.path.isfile(ofed_info):
ctx.end_msg('not found', 'YELLOW')
return False
@@ -1552,8 +1552,6 @@ class build_option:
flags += ['-DNDEBUG'];
else:
flags += ['-UNDEBUG'];
- if bld.env.OFED_OK:
- flags += ['-DHAVE_IBV_MLX4_WQE_LSO_SEG=1']
return (flags)
def get_bnxt_flags(self):
diff --git a/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h b/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h
index b3d68683..35474409 100644
--- a/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h
+++ b/src/dpdk/drivers/net/mlx4/mlx4_autoconf.h
@@ -1,3 +1,6 @@
-#ifndef HAVE_IBV_MLX4_WQE_LSO_SEG
-#define HAVE_IBV_MLX4_WQE_LSO_SEG
-#endif
+/* HAVE_IBV_MLX4_BUF_ALLOCATORS is not defined. */
+
+/* HAVE_IBV_MLX4_UAR_MMAP_OFFSET is not defined. */
+
+/* HAVE_IBV_MLX4_WQE_LSO_SEG is not defined. */
+
diff --git a/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h b/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h
index 8770fdde..75db5ae8 100644
--- a/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h
+++ b/src/dpdk/drivers/net/mlx5/mlx5_autoconf.h
@@ -1,54 +1,362 @@
-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
-#define HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT
-#endif
+/* HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT is not defined. */
-#ifndef HAVE_IBV_FLOW_DV_SUPPORT
-#define HAVE_IBV_FLOW_DV_SUPPORT
-#endif
+#ifndef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+#define HAVE_IBV_DEVICE_TUNNEL_SUPPORT 1
+#endif /* HAVE_IBV_DEVICE_TUNNEL_SUPPORT */
-#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_V45
-#define HAVE_IBV_DEVICE_COUNTERS_SET_V45
-#endif
+/* HAVE_IBV_DEVICE_MPLS_SUPPORT is not defined. */
-#ifndef HAVE_IBV_FLOW_DEVX_COUNTERS
-#define HAVE_IBV_FLOW_DEVX_COUNTERS
-#endif
+#ifndef HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING
+#define HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING 1
+#endif /* HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING */
-#ifndef HAVE_IBV_MLX4_WQE_LSO_SEG
-#define HAVE_IBV_MLX4_WQE_LSO_SEG
-#endif
+/* HAVE_IBV_WQ_FLAG_RX_END_PADDING is not defined. */
+#ifndef HAVE_IBV_MLX5_MOD_SWP
+#define HAVE_IBV_MLX5_MOD_SWP 1
+#endif /* HAVE_IBV_MLX5_MOD_SWP */
-#ifdef SUPPORTED_40000baseKR4_Full
+#ifndef HAVE_IBV_MLX5_MOD_MPW
+#define HAVE_IBV_MLX5_MOD_MPW 1
+#endif /* HAVE_IBV_MLX5_MOD_MPW */
+
+#ifndef HAVE_IBV_MLX5_MOD_CQE_128B_COMP
+#define HAVE_IBV_MLX5_MOD_CQE_128B_COMP 1
+#endif /* HAVE_IBV_MLX5_MOD_CQE_128B_COMP */
+
+#ifndef HAVE_IBV_MLX5_MOD_CQE_128B_PAD
+#define HAVE_IBV_MLX5_MOD_CQE_128B_PAD 1
+#endif /* HAVE_IBV_MLX5_MOD_CQE_128B_PAD */
+
+/* HAVE_IBV_FLOW_DV_SUPPORT is not defined. */
+
+/* HAVE_MLX5DV_DR is not defined. */
+
+/* HAVE_MLX5DV_DR_ESWITCH is not defined. */
+
+/* HAVE_IBV_DEVX_OBJ is not defined. */
+
+/* HAVE_IBV_FLOW_DEVX_COUNTERS is not defined. */
+
+#ifndef HAVE_ETHTOOL_LINK_MODE_25G
+#define HAVE_ETHTOOL_LINK_MODE_25G 1
+#endif /* HAVE_ETHTOOL_LINK_MODE_25G */
+
+#ifndef HAVE_ETHTOOL_LINK_MODE_50G
+#define HAVE_ETHTOOL_LINK_MODE_50G 1
+#endif /* HAVE_ETHTOOL_LINK_MODE_50G */
+
+#ifndef HAVE_ETHTOOL_LINK_MODE_100G
+#define HAVE_ETHTOOL_LINK_MODE_100G 1
+#endif /* HAVE_ETHTOOL_LINK_MODE_100G */
+
+/* HAVE_IBV_DEVICE_COUNTERS_SET_V42 is not defined. */
+
+/* HAVE_IBV_DEVICE_COUNTERS_SET_V45 is not defined. */
+
+#ifndef HAVE_RDMA_NL_NLDEV
+#define HAVE_RDMA_NL_NLDEV 1
+#endif /* HAVE_RDMA_NL_NLDEV */
+
+#ifndef HAVE_RDMA_NLDEV_CMD_GET
+#define HAVE_RDMA_NLDEV_CMD_GET 1
+#endif /* HAVE_RDMA_NLDEV_CMD_GET */
+
+#ifndef HAVE_RDMA_NLDEV_CMD_PORT_GET
+#define HAVE_RDMA_NLDEV_CMD_PORT_GET 1
+#endif /* HAVE_RDMA_NLDEV_CMD_PORT_GET */
+
+#ifndef HAVE_RDMA_NLDEV_ATTR_DEV_INDEX
+#define HAVE_RDMA_NLDEV_ATTR_DEV_INDEX 1
+#endif /* HAVE_RDMA_NLDEV_ATTR_DEV_INDEX */
+
+#ifndef HAVE_RDMA_NLDEV_ATTR_DEV_NAME
+#define HAVE_RDMA_NLDEV_ATTR_DEV_NAME 1
+#endif /* HAVE_RDMA_NLDEV_ATTR_DEV_NAME */
+
+#ifndef HAVE_RDMA_NLDEV_ATTR_PORT_INDEX
+#define HAVE_RDMA_NLDEV_ATTR_PORT_INDEX 1
+#endif /* HAVE_RDMA_NLDEV_ATTR_PORT_INDEX */
+
+/* HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX is not defined. */
+
+#ifndef HAVE_IFLA_NUM_VF
+#define HAVE_IFLA_NUM_VF 1
+#endif /* HAVE_IFLA_NUM_VF */
+
+#ifndef HAVE_IFLA_EXT_MASK
+#define HAVE_IFLA_EXT_MASK 1
+#endif /* HAVE_IFLA_EXT_MASK */
+
+#ifndef HAVE_IFLA_PHYS_SWITCH_ID
+#define HAVE_IFLA_PHYS_SWITCH_ID 1
+#endif /* HAVE_IFLA_PHYS_SWITCH_ID */
+
+#ifndef HAVE_IFLA_PHYS_PORT_NAME
+#define HAVE_IFLA_PHYS_PORT_NAME 1
+#endif /* HAVE_IFLA_PHYS_PORT_NAME */
+
+#ifndef HAVE_IFLA_VXLAN_COLLECT_METADATA
+#define HAVE_IFLA_VXLAN_COLLECT_METADATA 1
+#endif /* HAVE_IFLA_VXLAN_COLLECT_METADATA */
+
+#ifndef HAVE_TCA_CHAIN
+#define HAVE_TCA_CHAIN 1
+#endif /* HAVE_TCA_CHAIN */
+
+#ifndef HAVE_TCA_FLOWER_ACT
+#define HAVE_TCA_FLOWER_ACT 1
+#endif /* HAVE_TCA_FLOWER_ACT */
+
+#ifndef HAVE_TCA_FLOWER_FLAGS
+#define HAVE_TCA_FLOWER_FLAGS 1
+#endif /* HAVE_TCA_FLOWER_FLAGS */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ETH_TYPE
+#define HAVE_TCA_FLOWER_KEY_ETH_TYPE 1
+#endif /* HAVE_TCA_FLOWER_KEY_ETH_TYPE */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ETH_DST
+#define HAVE_TCA_FLOWER_KEY_ETH_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_ETH_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ETH_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_ETH_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ETH_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ETH_SRC
+#define HAVE_TCA_FLOWER_KEY_ETH_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_ETH_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IP_PROTO
+#define HAVE_TCA_FLOWER_KEY_IP_PROTO 1
+#endif /* HAVE_TCA_FLOWER_KEY_IP_PROTO */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV4_SRC
+#define HAVE_TCA_FLOWER_KEY_IPV4_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV4_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV4_DST
+#define HAVE_TCA_FLOWER_KEY_IPV4_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV4_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV6_SRC
+#define HAVE_TCA_FLOWER_KEY_IPV6_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV6_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV6_DST
+#define HAVE_TCA_FLOWER_KEY_IPV6_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV6_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_TCP_SRC
+#define HAVE_TCA_FLOWER_KEY_TCP_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_TCP_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_TCP_DST
+#define HAVE_TCA_FLOWER_KEY_TCP_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_TCP_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_TCP_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_TCP_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_TCP_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_UDP_SRC
+#define HAVE_TCA_FLOWER_KEY_UDP_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_UDP_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_UDP_DST
+#define HAVE_TCA_FLOWER_KEY_UDP_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_UDP_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_UDP_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_UDP_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_UDP_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_VLAN_ID
+#define HAVE_TCA_FLOWER_KEY_VLAN_ID 1
+#endif /* HAVE_TCA_FLOWER_KEY_VLAN_ID */
+
+#ifndef HAVE_TCA_FLOWER_KEY_VLAN_PRIO
+#define HAVE_TCA_FLOWER_KEY_VLAN_PRIO 1
+#endif /* HAVE_TCA_FLOWER_KEY_VLAN_PRIO */
+
+#ifndef HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE
+#define HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE 1
+#endif /* HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE */
+
+#ifndef HAVE_TCA_FLOWER_KEY_TCP_FLAGS
+#define HAVE_TCA_FLOWER_KEY_TCP_FLAGS 1
+#endif /* HAVE_TCA_FLOWER_KEY_TCP_FLAGS */
+
+#ifndef HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK
+#define HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TOS
+#define HAVE_TCA_FLOWER_KEY_IP_TOS 1
+#endif /* HAVE_TCA_FLOWER_KEY_IP_TOS */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TOS_MASK
+#define HAVE_TCA_FLOWER_KEY_IP_TOS_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_IP_TOS_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TTL
+#define HAVE_TCA_FLOWER_KEY_IP_TTL 1
+#endif /* HAVE_TCA_FLOWER_KEY_IP_TTL */
+
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TTL_MASK
+#define HAVE_TCA_FLOWER_KEY_IP_TTL_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_IP_TTL_MASK */
+
+#ifndef HAVE_TC_ACT_GOTO_CHAIN
+#define HAVE_TC_ACT_GOTO_CHAIN 1
+#endif /* HAVE_TC_ACT_GOTO_CHAIN */
+
+#ifndef HAVE_TC_ACT_VLAN
+#define HAVE_TC_ACT_VLAN 1
+#endif /* HAVE_TC_ACT_VLAN */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_KEY_ID
+#define HAVE_TCA_FLOWER_KEY_ENC_KEY_ID 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_KEY_ID */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK
+#define HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT
+#define HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK
+#define HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT
+#define HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT */
+
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK
+#define HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK 1
+#endif /* HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK */
+
+/* HAVE_TCA_FLOWER_KEY_ENC_IP_TOS is not defined. */
+
+/* HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK is not defined. */
+
+/* HAVE_TCA_FLOWER_KEY_ENC_IP_TTL is not defined. */
+
+/* HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK is not defined. */
+
+#ifndef HAVE_TC_ACT_TUNNEL_KEY
+#define HAVE_TC_ACT_TUNNEL_KEY 1
+#endif /* HAVE_TC_ACT_TUNNEL_KEY */
+
+#ifndef HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT
+#define HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT 1
+#endif /* HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT */
+
+/* HAVE_TCA_TUNNEL_KEY_ENC_TOS is not defined. */
+
+/* HAVE_TCA_TUNNEL_KEY_ENC_TTL is not defined. */
+
+#ifndef HAVE_TCA_TUNNEL_KEY_NO_CSUM
+#define HAVE_TCA_TUNNEL_KEY_NO_CSUM 1
+#endif /* HAVE_TCA_TUNNEL_KEY_NO_CSUM */
+
+#ifndef HAVE_TC_ACT_PEDIT
+#define HAVE_TC_ACT_PEDIT 1
+#endif /* HAVE_TC_ACT_PEDIT */
+
+#ifndef HAVE_SUPPORTED_40000baseKR4_Full
#define HAVE_SUPPORTED_40000baseKR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_40000baseKR4_Full */
-#ifdef SUPPORTED_40000baseCR4_Full
+#ifndef HAVE_SUPPORTED_40000baseCR4_Full
#define HAVE_SUPPORTED_40000baseCR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_40000baseCR4_Full */
-#ifdef SUPPORTED_40000baseSR4_Full
+#ifndef HAVE_SUPPORTED_40000baseSR4_Full
#define HAVE_SUPPORTED_40000baseSR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_40000baseSR4_Full */
-#ifdef SUPPORTED_40000baseLR4_Full
+#ifndef HAVE_SUPPORTED_40000baseLR4_Full
#define HAVE_SUPPORTED_40000baseLR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_40000baseLR4_Full */
-#ifdef SUPPORTED_56000baseKR4_Full
+#ifndef HAVE_SUPPORTED_56000baseKR4_Full
#define HAVE_SUPPORTED_56000baseKR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_56000baseKR4_Full */
-#ifdef SUPPORTED_56000baseCR4_Full
+#ifndef HAVE_SUPPORTED_56000baseCR4_Full
#define HAVE_SUPPORTED_56000baseCR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_56000baseCR4_Full */
-#ifdef SUPPORTED_56000baseSR4_Full
+#ifndef HAVE_SUPPORTED_56000baseSR4_Full
#define HAVE_SUPPORTED_56000baseSR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_56000baseSR4_Full */
-#ifdef SUPPORTED_56000baseLR4_Full
+#ifndef HAVE_SUPPORTED_56000baseLR4_Full
#define HAVE_SUPPORTED_56000baseLR4_Full 1
-#endif
+#endif /* HAVE_SUPPORTED_56000baseLR4_Full */
+#ifndef HAVE_STATIC_ASSERT
+#define HAVE_STATIC_ASSERT 1
+#endif /* HAVE_STATIC_ASSERT */
diff --git a/src/dpdk/drivers/net/tap/rte_eth_tap.c b/src/dpdk/drivers/net/tap/rte_eth_tap.c
index bc889c19..47a2b68f 100644
--- a/src/dpdk/drivers/net/tap/rte_eth_tap.c
+++ b/src/dpdk/drivers/net/tap/rte_eth_tap.c
@@ -34,8 +34,8 @@
#include <unistd.h>
#include <arpa/inet.h>
#include <net/if.h>
-#include <linux_tap/if_tun.h>
-#include <linux_tap/if_ether.h>
+#include <linux/if_tun.h>
+#include <linux/if_ether.h>
#include <fcntl.h>
#include <ctype.h>
diff --git a/src/dpdk/drivers/net/tap/rte_eth_tap.h b/src/dpdk/drivers/net/tap/rte_eth_tap.h
index 66cd3441..dc3579ac 100644
--- a/src/dpdk/drivers/net/tap/rte_eth_tap.h
+++ b/src/dpdk/drivers/net/tap/rte_eth_tap.h
@@ -11,7 +11,7 @@
#include <inttypes.h>
#include <net/if.h>
-#include <linux_tap/if_tun.h>
+#include <linux/if_tun.h>
#include <rte_ethdev_driver.h>
#include <rte_ether.h>
diff --git a/src/dpdk/drivers/net/tap/tap_autoconf.h b/src/dpdk/drivers/net/tap/tap_autoconf.h
index dddd4ae6..d5880608 100644
--- a/src/dpdk/drivers/net/tap/tap_autoconf.h
+++ b/src/dpdk/drivers/net/tap/tap_autoconf.h
@@ -1,14 +1,24 @@
#ifndef HAVE_TC_FLOWER
#define HAVE_TC_FLOWER 1
-#endif
+#endif /* HAVE_TC_FLOWER */
+#ifndef HAVE_TC_VLAN_ID
+#define HAVE_TC_VLAN_ID 1
+#endif /* HAVE_TC_VLAN_ID */
#ifndef HAVE_TC_BPF
#define HAVE_TC_BPF 1
-#endif
+#endif /* HAVE_TC_BPF */
-#ifndef HAVE_TC_VLAN_ID
-#define HAVE_TC_VLAN_ID 1
-#endif
+#ifndef HAVE_TC_BPF_FD
+#define HAVE_TC_BPF_FD 1
+#endif /* HAVE_TC_BPF_FD */
+
+#ifndef HAVE_TC_ACT_BPF
+#define HAVE_TC_ACT_BPF 1
+#endif /* HAVE_TC_ACT_BPF */
+#ifndef HAVE_TC_ACT_BPF_FD
+#define HAVE_TC_ACT_BPF_FD 1
+#endif /* HAVE_TC_ACT_BPF_FD */
diff --git a/src/dpdk/drivers/net/tap/tap_netlink.h b/src/dpdk/drivers/net/tap/tap_netlink.h
index 900ce375..faa73ba1 100644
--- a/src/dpdk/drivers/net/tap/tap_netlink.h
+++ b/src/dpdk/drivers/net/tap/tap_netlink.h
@@ -8,8 +8,8 @@
#include <ctype.h>
#include <inttypes.h>
-#include <linux_tap/rtnetlink.h>
-#include <linux_tap/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/netlink.h>
#include <stdio.h>
#include <rte_log.h>
diff --git a/src/dpdk/drivers/net/tap/tap_tcmsgs.h b/src/dpdk/drivers/net/tap/tap_tcmsgs.h
index 782de540..8cedea84 100644
--- a/src/dpdk/drivers/net/tap/tap_tcmsgs.h
+++ b/src/dpdk/drivers/net/tap/tap_tcmsgs.h
@@ -7,13 +7,13 @@
#define _TAP_TCMSGS_H_
#include <tap_autoconf.h>
-#include <linux_tap/if_ether.h>
-#include <linux_tap/rtnetlink.h>
-#include <linux_tap/pkt_sched.h>
-#include <linux_tap/pkt_cls.h>
-#include <linux_tap/tc_act/tc_mirred.h>
-#include <linux_tap/tc_act/tc_gact.h>
-#include <linux_tap/tc_act/tc_skbedit.h>
+#include <linux/if_ether.h>
+#include <linux/rtnetlink.h>
+#include <linux/pkt_sched.h>
+#include <linux/pkt_cls.h>
+#include <linux/tc_act/tc_mirred.h>
+#include <linux/tc_act/tc_gact.h>
+#include <linux/tc_act/tc_skbedit.h>
#ifdef HAVE_TC_ACT_BPF
#include <linux/tc_act/tc_bpf.h>
#endif
|
