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/bnxt: fix build with some compilers
[dpdk.git]
/
app
/
test-pmd
/
flowgen.c
diff --git
a/app/test-pmd/flowgen.c
b/app/test-pmd/flowgen.c
index
3f29e94
..
ade6fe5
100644
(file)
--- a/
app/test-pmd/flowgen.c
+++ b/
app/test-pmd/flowgen.c
@@
-72,8
+72,8
@@
/* hardcoded configuration (for now) */
static unsigned cfg_n_flows = 1024;
/* hardcoded configuration (for now) */
static unsigned cfg_n_flows = 1024;
-static uint32_t cfg_ip_src =
IPv
4(10, 254, 0, 0);
-static uint32_t cfg_ip_dst =
IPv
4(10, 253, 0, 0);
+static uint32_t cfg_ip_src =
RTE_IPV
4(10, 254, 0, 0);
+static uint32_t cfg_ip_dst =
RTE_IPV
4(10, 253, 0, 0);
static uint16_t cfg_udp_src = 1000;
static uint16_t cfg_udp_dst = 1001;
static struct rte_ether_addr cfg_ether_src =
static uint16_t cfg_udp_src = 1000;
static uint16_t cfg_udp_dst = 1001;
static struct rte_ether_addr cfg_ether_src =
@@
-120,8
+120,8
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
struct rte_mempool *mbp;
struct rte_mbuf *pkt;
struct rte_ether_hdr *eth_hdr;
struct rte_mempool *mbp;
struct rte_mbuf *pkt;
struct rte_ether_hdr *eth_hdr;
- struct ipv4_hdr *ip_hdr;
- struct udp_hdr *udp_hdr;
+ struct
rte_
ipv4_hdr *ip_hdr;
+ struct
rte_
udp_hdr *udp_hdr;
uint16_t vlan_tci, vlan_tci_outer;
uint64_t ol_flags = 0;
uint16_t nb_rx;
uint16_t vlan_tci, vlan_tci_outer;
uint64_t ol_flags = 0;
uint16_t nb_rx;
@@
-173,10
+173,10
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->d_addr);
rte_ether_addr_copy(&cfg_ether_src, ð_hdr->s_addr);
eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->d_addr);
rte_ether_addr_copy(&cfg_ether_src, ð_hdr->s_addr);
- eth_hdr->ether_type = rte_cpu_to_be_16(
ETHER_TYPE_IPv
4);
+ eth_hdr->ether_type = rte_cpu_to_be_16(
RTE_ETHER_TYPE_IPV
4);
/* Initialize IP header. */
/* Initialize IP header. */
- ip_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
+ ip_hdr = (struct
rte_
ipv4_hdr *)(eth_hdr + 1);
memset(ip_hdr, 0, sizeof(*ip_hdr));
ip_hdr->version_ihl = IP_VHL_DEF;
ip_hdr->type_of_service = 0;
memset(ip_hdr, 0, sizeof(*ip_hdr));
ip_hdr->version_ihl = IP_VHL_DEF;
ip_hdr->type_of_service = 0;
@@
-193,7
+193,7
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
sizeof(*ip_hdr));
/* Initialize UDP header. */
sizeof(*ip_hdr));
/* Initialize UDP header. */
- udp_hdr = (struct udp_hdr *)(ip_hdr + 1);
+ udp_hdr = (struct
rte_
udp_hdr *)(ip_hdr + 1);
udp_hdr->src_port = rte_cpu_to_be_16(cfg_udp_src);
udp_hdr->dst_port = rte_cpu_to_be_16(cfg_udp_dst);
udp_hdr->dgram_cksum = 0; /* No UDP checksum. */
udp_hdr->src_port = rte_cpu_to_be_16(cfg_udp_src);
udp_hdr->dst_port = rte_cpu_to_be_16(cfg_udp_dst);
udp_hdr->dgram_cksum = 0; /* No UDP checksum. */
@@
-206,7
+206,7
@@
pkt_burst_flow_gen(struct fwd_stream *fs)
pkt->vlan_tci = vlan_tci;
pkt->vlan_tci_outer = vlan_tci_outer;
pkt->l2_len = sizeof(struct rte_ether_hdr);
pkt->vlan_tci = vlan_tci;
pkt->vlan_tci_outer = vlan_tci_outer;
pkt->l2_len = sizeof(struct rte_ether_hdr);
- pkt->l3_len = sizeof(struct ipv4_hdr);
+ pkt->l3_len = sizeof(struct
rte_
ipv4_hdr);
pkts_burst[nb_pkt] = pkt;
next_flow = (next_flow + 1) % cfg_n_flows;
pkts_burst[nb_pkt] = pkt;
next_flow = (next_flow + 1) % cfg_n_flows;