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/ice: fix flow API switch filter
[dpdk.git]
/
app
/
test-pmd
/
testpmd.h
diff --git
a/app/test-pmd/testpmd.h
b/app/test-pmd/testpmd.h
index
e2117e6
..
e3a6f7c
100644
(file)
--- a/
app/test-pmd/testpmd.h
+++ b/
app/test-pmd/testpmd.h
@@
-162,7
+162,7
@@
struct softnic_port {
struct rte_port {
struct rte_eth_dev_info dev_info; /**< PCI info + driver name */
struct rte_eth_conf dev_conf; /**< Port configuration. */
struct rte_port {
struct rte_eth_dev_info dev_info; /**< PCI info + driver name */
struct rte_eth_conf dev_conf; /**< Port configuration. */
- struct ether_addr eth_addr; /**< Port ethernet address */
+ struct
rte_
ether_addr eth_addr; /**< Port ethernet address */
struct rte_eth_stats stats; /**< Last port statistics */
unsigned int socket_id; /**< For NUMA support */
uint16_t parse_tunnel:1; /**< Parse internal headers */
struct rte_eth_stats stats; /**< Last port statistics */
unsigned int socket_id; /**< For NUMA support */
uint16_t parse_tunnel:1; /**< Parse internal headers */
@@
-182,7
+182,7
@@
struct rte_port {
uint16_t nb_tx_desc[MAX_QUEUE_ID+1]; /**< per queue tx desc number */
struct rte_eth_rxconf rx_conf[MAX_QUEUE_ID+1]; /**< per queue rx configuration */
struct rte_eth_txconf tx_conf[MAX_QUEUE_ID+1]; /**< per queue tx configuration */
uint16_t nb_tx_desc[MAX_QUEUE_ID+1]; /**< per queue tx desc number */
struct rte_eth_rxconf rx_conf[MAX_QUEUE_ID+1]; /**< per queue rx configuration */
struct rte_eth_txconf tx_conf[MAX_QUEUE_ID+1]; /**< per queue tx configuration */
- struct
ether_addr
*mc_addr_pool; /**< pool of multicast addrs */
+ struct
rte_ether_addr
*mc_addr_pool; /**< pool of multicast addrs */
uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
uint8_t slave_flag; /**< bonding slave port */
struct port_flow *flow_list; /**< Associated flows. */
uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
uint8_t slave_flag; /**< bonding slave port */
struct port_flow *flow_list; /**< Associated flows. */
@@
-445,6
+445,12
@@
extern int8_t tx_pthresh;
extern int8_t tx_hthresh;
extern int8_t tx_wthresh;
extern int8_t tx_hthresh;
extern int8_t tx_wthresh;
+extern uint16_t tx_udp_src_port;
+extern uint16_t tx_udp_dst_port;
+
+extern uint32_t tx_ip_src_addr;
+extern uint32_t tx_ip_dst_addr;
+
extern struct fwd_config cur_fwd_config;
extern struct fwd_engine *cur_fwd_eng;
extern uint32_t retry_enabled;
extern struct fwd_config cur_fwd_config;
extern struct fwd_engine *cur_fwd_eng;
extern uint32_t retry_enabled;
@@
-454,7
+460,7
@@
extern struct fwd_stream **fwd_streams;
extern uint16_t vxlan_gpe_udp_port; /**< UDP port of tunnel VXLAN-GPE. */
extern portid_t nb_peer_eth_addrs; /**< Number of peer ethernet addresses. */
extern uint16_t vxlan_gpe_udp_port; /**< UDP port of tunnel VXLAN-GPE. */
extern portid_t nb_peer_eth_addrs; /**< Number of peer ethernet addresses. */
-extern struct ether_addr peer_eth_addrs[RTE_MAX_ETHPORTS];
+extern struct
rte_
ether_addr peer_eth_addrs[RTE_MAX_ETHPORTS];
extern uint32_t burst_tx_delay_time; /**< Burst tx delay time(us) for mac-retry. */
extern uint32_t burst_tx_retry_num; /**< Burst tx retry number for mac-retry. */
extern uint32_t burst_tx_delay_time; /**< Burst tx delay time(us) for mac-retry. */
extern uint32_t burst_tx_retry_num; /**< Burst tx retry number for mac-retry. */
@@
-495,8
+501,8
@@
struct vxlan_encap_conf {
rte_be16_t vlan_tci;
uint8_t ip_tos;
uint8_t ip_ttl;
rte_be16_t vlan_tci;
uint8_t ip_tos;
uint8_t ip_ttl;
- uint8_t eth_src[ETHER_ADDR_LEN];
- uint8_t eth_dst[ETHER_ADDR_LEN];
+ uint8_t eth_src[
RTE_
ETHER_ADDR_LEN];
+ uint8_t eth_dst[
RTE_
ETHER_ADDR_LEN];
};
struct vxlan_encap_conf vxlan_encap_conf;
};
struct vxlan_encap_conf vxlan_encap_conf;
@@
-510,8
+516,8
@@
struct nvgre_encap_conf {
uint8_t ipv6_src[16];
uint8_t ipv6_dst[16];
rte_be16_t vlan_tci;
uint8_t ipv6_src[16];
uint8_t ipv6_dst[16];
rte_be16_t vlan_tci;
- uint8_t eth_src[ETHER_ADDR_LEN];
- uint8_t eth_dst[ETHER_ADDR_LEN];
+ uint8_t eth_src[
RTE_
ETHER_ADDR_LEN];
+ uint8_t eth_dst[
RTE_
ETHER_ADDR_LEN];
};
struct nvgre_encap_conf nvgre_encap_conf;
};
struct nvgre_encap_conf nvgre_encap_conf;
@@
-520,8
+526,8
@@
struct l2_encap_conf {
uint32_t select_ipv4:1;
uint32_t select_vlan:1;
rte_be16_t vlan_tci;
uint32_t select_ipv4:1;
uint32_t select_vlan:1;
rte_be16_t vlan_tci;
- uint8_t eth_src[ETHER_ADDR_LEN];
- uint8_t eth_dst[ETHER_ADDR_LEN];
+ uint8_t eth_src[
RTE_
ETHER_ADDR_LEN];
+ uint8_t eth_dst[
RTE_
ETHER_ADDR_LEN];
};
struct l2_encap_conf l2_encap_conf;
};
struct l2_encap_conf l2_encap_conf;
@@
-541,8
+547,8
@@
struct mplsogre_encap_conf {
uint8_t ipv6_src[16];
uint8_t ipv6_dst[16];
rte_be16_t vlan_tci;
uint8_t ipv6_src[16];
uint8_t ipv6_dst[16];
rte_be16_t vlan_tci;
- uint8_t eth_src[ETHER_ADDR_LEN];
- uint8_t eth_dst[ETHER_ADDR_LEN];
+ uint8_t eth_src[
RTE_
ETHER_ADDR_LEN];
+ uint8_t eth_dst[
RTE_
ETHER_ADDR_LEN];
};
struct mplsogre_encap_conf mplsogre_encap_conf;
};
struct mplsogre_encap_conf mplsogre_encap_conf;
@@
-565,8
+571,8
@@
struct mplsoudp_encap_conf {
uint8_t ipv6_src[16];
uint8_t ipv6_dst[16];
rte_be16_t vlan_tci;
uint8_t ipv6_src[16];
uint8_t ipv6_dst[16];
rte_be16_t vlan_tci;
- uint8_t eth_src[ETHER_ADDR_LEN];
- uint8_t eth_dst[ETHER_ADDR_LEN];
+ uint8_t eth_src[
RTE_
ETHER_ADDR_LEN];
+ uint8_t eth_dst[
RTE_
ETHER_ADDR_LEN];
};
struct mplsoudp_encap_conf mplsoudp_encap_conf;
};
struct mplsoudp_encap_conf mplsoudp_encap_conf;
@@
-813,8
+819,8
@@
void show_gro(portid_t port_id);
void setup_gso(const char *mode, portid_t port_id);
/* Functions to manage the set of filtered Multicast MAC addresses */
void setup_gso(const char *mode, portid_t port_id);
/* Functions to manage the set of filtered Multicast MAC addresses */
-void mcast_addr_add(portid_t port_id, struct ether_addr *mc_addr);
-void mcast_addr_remove(portid_t port_id, struct ether_addr *mc_addr);
+void mcast_addr_add(portid_t port_id, struct
rte_
ether_addr *mc_addr);
+void mcast_addr_remove(portid_t port_id, struct
rte_
ether_addr *mc_addr);
void port_dcb_info_display(portid_t port_id);
uint8_t *open_file(const char *file_path, uint32_t *size);
void port_dcb_info_display(portid_t port_id);
uint8_t *open_file(const char *file_path, uint32_t *size);