Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "MTU: Setting of MTU on software interface (instead of hardware interface)"
[vpp.git]
/
src
/
plugins
/
dpdk
/
device
/
dpdk.h
diff --git
a/src/plugins/dpdk/device/dpdk.h
b/src/plugins/dpdk/device/dpdk.h
index
5313a24
..
1f43a48
100644
(file)
--- a/
src/plugins/dpdk/device/dpdk.h
+++ b/
src/plugins/dpdk/device/dpdk.h
@@
-39,9
+39,7
@@
#include <rte_eth_bond.h>
#include <rte_sched.h>
#include <rte_net.h>
#include <rte_eth_bond.h>
#include <rte_sched.h>
#include <rte_net.h>
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 0)
#include <rte_bus_pci.h>
#include <rte_bus_pci.h>
-#endif
#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
@@
-94,10
+92,14
@@
typedef enum
typedef enum
{
VNET_DPDK_PORT_TYPE_ETH_1G,
typedef enum
{
VNET_DPDK_PORT_TYPE_ETH_1G,
+ VNET_DPDK_PORT_TYPE_ETH_2_5G,
+ VNET_DPDK_PORT_TYPE_ETH_5G,
VNET_DPDK_PORT_TYPE_ETH_10G,
VNET_DPDK_PORT_TYPE_ETH_10G,
+ VNET_DPDK_PORT_TYPE_ETH_20G,
VNET_DPDK_PORT_TYPE_ETH_25G,
VNET_DPDK_PORT_TYPE_ETH_40G,
VNET_DPDK_PORT_TYPE_ETH_50G,
VNET_DPDK_PORT_TYPE_ETH_25G,
VNET_DPDK_PORT_TYPE_ETH_40G,
VNET_DPDK_PORT_TYPE_ETH_50G,
+ VNET_DPDK_PORT_TYPE_ETH_56G,
VNET_DPDK_PORT_TYPE_ETH_100G,
VNET_DPDK_PORT_TYPE_ETH_BOND,
VNET_DPDK_PORT_TYPE_ETH_SWITCH,
VNET_DPDK_PORT_TYPE_ETH_100G,
VNET_DPDK_PORT_TYPE_ETH_BOND,
VNET_DPDK_PORT_TYPE_ETH_SWITCH,
@@
-119,11
+121,7
@@
typedef struct
u64 tx_tail;
} tx_ring_hdr_t;
u64 tx_tail;
} tx_ring_hdr_t;
-#if RTE_VERSION < RTE_VERSION_NUM(17, 11, 0, 0)
-typedef uint8_t dpdk_portid_t;
-#else
typedef uint16_t dpdk_portid_t;
typedef uint16_t dpdk_portid_t;
-#endif
typedef struct
{
typedef struct
{