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
vhost: add packed ring single dequeue
[dpdk.git]
/
examples
/
l3fwd
/
l3fwd_em_hlm.h
diff --git
a/examples/l3fwd/l3fwd_em_hlm.h
b/examples/l3fwd/l3fwd_em_hlm.h
index
22c26dc
..
ad8b9ce
100644
(file)
--- a/
examples/l3fwd/l3fwd_em_hlm.h
+++ b/
examples/l3fwd/l3fwd_em_hlm.h
@@
-80,8
+80,8
@@
em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
uint16_t portid)
{
uint16_t next_hop;
uint16_t portid)
{
uint16_t next_hop;
- struct ipv4_hdr *ipv4_hdr;
- struct ipv6_hdr *ipv6_hdr;
+ struct
rte_
ipv4_hdr *ipv4_hdr;
+ struct
rte_
ipv6_hdr *ipv6_hdr;
uint32_t tcp_or_udp;
uint32_t l3_ptypes;
uint32_t tcp_or_udp;
uint32_t l3_ptypes;
@@
-91,8
+91,8
@@
em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV4)) {
/* Handle IPv4 headers.*/
if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV4)) {
/* Handle IPv4 headers.*/
- ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,
- sizeof(struct ether_hdr));
+ ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct
rte_
ipv4_hdr *,
+ sizeof(struct
rte_
ether_hdr));
next_hop = em_get_ipv4_dst_port(ipv4_hdr, portid,
qconf->ipv4_lookup_struct);
next_hop = em_get_ipv4_dst_port(ipv4_hdr, portid,
qconf->ipv4_lookup_struct);
@@
-106,8
+106,8
@@
em_get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
} else if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV6)) {
/* Handle IPv6 headers.*/
} else if (tcp_or_udp && (l3_ptypes == RTE_PTYPE_L3_IPV6)) {
/* Handle IPv6 headers.*/
- ipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv6_hdr *,
- sizeof(struct ether_hdr));
+ ipv6_hdr = rte_pktmbuf_mtod_offset(pkt, struct
rte_
ipv6_hdr *,
+ sizeof(struct
rte_
ether_hdr));
next_hop = em_get_ipv6_dst_port(ipv6_hdr, portid,
qconf->ipv6_lookup_struct);
next_hop = em_get_ipv6_dst_port(ipv6_hdr, portid,
qconf->ipv6_lookup_struct);
@@
-142,7
+142,7
@@
l3fwd_em_send_packets(int nb_rx, struct rte_mbuf **pkts_burst,
for (j = 0; j < EM_HASH_LOOKUP_COUNT && j < nb_rx; j++) {
rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[j],
for (j = 0; j < EM_HASH_LOOKUP_COUNT && j < nb_rx; j++) {
rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[j],
- struct ether_hdr *) + 1);
+ struct
rte_
ether_hdr *) + 1);
}
for (j = 0; j < n; j += EM_HASH_LOOKUP_COUNT) {
}
for (j = 0; j < n; j += EM_HASH_LOOKUP_COUNT) {
@@
-159,8
+159,9
@@
l3fwd_em_send_packets(int nb_rx, struct rte_mbuf **pkts_burst,
for (i = 0, pos = j + EM_HASH_LOOKUP_COUNT;
i < EM_HASH_LOOKUP_COUNT && pos < nb_rx; i++, pos++) {
for (i = 0, pos = j + EM_HASH_LOOKUP_COUNT;
i < EM_HASH_LOOKUP_COUNT && pos < nb_rx; i++, pos++) {
- rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[pos],
- struct ether_hdr *) + 1);
+ rte_prefetch0(rte_pktmbuf_mtod(
+ pkts_burst[pos],
+ struct rte_ether_hdr *) + 1);
}
if (tcp_or_udp && (l3_type == RTE_PTYPE_L3_IPV4)) {
}
if (tcp_or_udp && (l3_type == RTE_PTYPE_L3_IPV4)) {