Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 18.02
[deb_dpdk.git]
/
app
/
test-pmd
/
macswap.c
diff --git
a/app/test-pmd/macswap.c
b/app/test-pmd/macswap.c
index
721865c
..
e2cc481
100644
(file)
--- a/
app/test-pmd/macswap.c
+++ b/
app/test-pmd/macswap.c
@@
-84,6
+84,7
@@
pkt_burst_mac_swap(struct fwd_stream *fs)
uint16_t i;
uint32_t retry;
uint64_t ol_flags = 0;
uint16_t i;
uint32_t retry;
uint64_t ol_flags = 0;
+ uint64_t tx_offloads;
#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
uint64_t start_tsc;
uint64_t end_tsc;
#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
uint64_t start_tsc;
uint64_t end_tsc;
@@
-107,11
+108,12
@@
pkt_burst_mac_swap(struct fwd_stream *fs)
#endif
fs->rx_packets += nb_rx;
txp = &ports[fs->tx_port];
#endif
fs->rx_packets += nb_rx;
txp = &ports[fs->tx_port];
- if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_VLAN)
+ tx_offloads = txp->dev_conf.txmode.offloads;
+ if (tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT)
ol_flags = PKT_TX_VLAN_PKT;
ol_flags = PKT_TX_VLAN_PKT;
- if (tx
p->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ
)
+ if (tx
_offloads & DEV_TX_OFFLOAD_QINQ_INSERT
)
ol_flags |= PKT_TX_QINQ_PKT;
ol_flags |= PKT_TX_QINQ_PKT;
- if (tx
p->tx_ol_flags & TESTPMD_TX_OFFLOAD_MACSEC
)
+ if (tx
_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT
)
ol_flags |= PKT_TX_MACSEC;
for (i = 0; i < nb_rx; i++) {
if (likely(i < nb_rx - 1))
ol_flags |= PKT_TX_MACSEC;
for (i = 0; i < nb_rx; i++) {
if (likely(i < nb_rx - 1))