Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add extern to *_main global variable declarations in header files.
[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
55f63b3
..
a0c57ea
100644
(file)
--- a/
src/plugins/dpdk/device/dpdk.h
+++ b/
src/plugins/dpdk/device/dpdk.h
@@
-38,6
+38,7
@@
#include <rte_version.h>
#include <rte_eth_bond.h>
#include <rte_sched.h>
#include <rte_version.h>
#include <rte_eth_bond.h>
#include <rte_sched.h>
+#include <rte_net.h>
#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
@@
-74,8
+75,8
@@
extern vlib_node_registration_t dpdk_input_node;
_ ("net_mlx4", MLX4) \
_ ("net_mlx5", MLX5) \
_ ("net_dpaa2", DPAA2) \
_ ("net_mlx4", MLX4) \
_ ("net_mlx5", MLX5) \
_ ("net_dpaa2", DPAA2) \
- _ ("net_virtio_user", VIRTIO_USER)
-
+ _ ("net_virtio_user", VIRTIO_USER)
\
+ _ ("net_vhost", VHOST_ETHER)
typedef enum
{
typedef enum
{
@@
-99,6
+100,7
@@
typedef enum
VNET_DPDK_PORT_TYPE_AF_PACKET,
VNET_DPDK_PORT_TYPE_ETH_VF,
VNET_DPDK_PORT_TYPE_VIRTIO_USER,
VNET_DPDK_PORT_TYPE_AF_PACKET,
VNET_DPDK_PORT_TYPE_ETH_VF,
VNET_DPDK_PORT_TYPE_VIRTIO_USER,
+ VNET_DPDK_PORT_TYPE_VHOST_ETHER,
VNET_DPDK_PORT_TYPE_UNKNOWN,
} dpdk_port_type_t;
VNET_DPDK_PORT_TYPE_UNKNOWN,
} dpdk_port_type_t;
@@
-176,6
+178,8
@@
typedef struct
#define DPDK_DEVICE_FLAG_HQOS (1 << 6)
#define DPDK_DEVICE_FLAG_BOND_SLAVE (1 << 7)
#define DPDK_DEVICE_FLAG_BOND_SLAVE_UP (1 << 8)
#define DPDK_DEVICE_FLAG_HQOS (1 << 6)
#define DPDK_DEVICE_FLAG_BOND_SLAVE (1 << 7)
#define DPDK_DEVICE_FLAG_BOND_SLAVE_UP (1 << 8)
+#define DPDK_DEVICE_FLAG_TX_OFFLOAD (1 << 9)
+#define DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM (1 << 10)
u16 nb_tx_desc;
CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
u16 nb_tx_desc;
CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
@@
-328,7
+332,7
@@
typedef struct
} dpdk_config_main_t;
} dpdk_config_main_t;
-dpdk_config_main_t dpdk_config_main;
+
extern
dpdk_config_main_t dpdk_config_main;
typedef struct
{
typedef struct
{
@@
-415,8
+419,15
@@
typedef struct
void dpdk_device_setup (dpdk_device_t * xd);
void dpdk_device_start (dpdk_device_t * xd);
void dpdk_device_stop (dpdk_device_t * xd);
void dpdk_device_setup (dpdk_device_t * xd);
void dpdk_device_start (dpdk_device_t * xd);
void dpdk_device_stop (dpdk_device_t * xd);
+
+#if DPDK_VOID_CALLBACK
void dpdk_port_state_callback (uint8_t port_id,
enum rte_eth_event_type type, void *param);
void dpdk_port_state_callback (uint8_t port_id,
enum rte_eth_event_type type, void *param);
+#else
+int dpdk_port_state_callback (uint8_t port_id,
+ enum rte_eth_event_type type,
+ void *param, void *ret_param);
+#endif
#define foreach_dpdk_error \
_(NONE, "no error") \
#define foreach_dpdk_error \
_(NONE, "no error") \
@@
-456,6
+467,11
@@
admin_up_down_process (vlib_main_t * vm,
clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
unsigned socket_id);
clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
unsigned socket_id);
+#if CLI_DEBUG
+int dpdk_buffer_validate_trajectory_all (u32 * uninitialized);
+void dpdk_buffer_poison_trajectory_all (void);
+#endif
+
#endif /* __included_dpdk_h__ */
/*
#endif /* __included_dpdk_h__ */
/*