X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fmacswap_common.h;h=0d43d5cceb8743917d0fed4d92c974324c9e89e4;hb=a1162c560965a5bc748eeb6d43c1e7072d806a04;hp=7e9a3590a436aec07787f5179125ff9c0dfefdb8;hpb=fce3169abae2e5e803df8f0e8701ad5776bec6e2;p=dpdk.git diff --git a/app/test-pmd/macswap_common.h b/app/test-pmd/macswap_common.h index 7e9a3590a4..0d43d5cceb 100644 --- a/app/test-pmd/macswap_common.h +++ b/app/test-pmd/macswap_common.h @@ -11,11 +11,11 @@ ol_flags_init(uint64_t tx_offload) uint64_t ol_flags = 0; ol_flags |= (tx_offload & DEV_TX_OFFLOAD_VLAN_INSERT) ? - PKT_TX_VLAN : 0; + RTE_MBUF_F_TX_VLAN : 0; ol_flags |= (tx_offload & DEV_TX_OFFLOAD_QINQ_INSERT) ? - PKT_TX_QINQ : 0; + RTE_MBUF_F_TX_QINQ : 0; ol_flags |= (tx_offload & DEV_TX_OFFLOAD_MACSEC_INSERT) ? - PKT_TX_MACSEC : 0; + RTE_MBUF_F_TX_MACSEC : 0; return ol_flags; } @@ -26,10 +26,10 @@ vlan_qinq_set(struct rte_mbuf *pkts[], uint16_t nb, { int i; - if (ol_flags & PKT_TX_VLAN) + if (ol_flags & RTE_MBUF_F_TX_VLAN) for (i = 0; i < nb; i++) pkts[i]->vlan_tci = vlan; - if (ol_flags & PKT_TX_QINQ) + if (ol_flags & RTE_MBUF_F_TX_QINQ) for (i = 0; i < nb; i++) pkts[i]->vlan_tci_outer = outer_vlan; } @@ -37,7 +37,7 @@ vlan_qinq_set(struct rte_mbuf *pkts[], uint16_t nb, static inline void mbuf_field_set(struct rte_mbuf *mb, uint64_t ol_flags) { - mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF; + mb->ol_flags &= RTE_MBUF_F_INDIRECT | RTE_MBUF_F_EXTERNAL; mb->ol_flags |= ol_flags; mb->l2_len = sizeof(struct rte_ether_hdr); mb->l3_len = sizeof(struct rte_ipv4_hdr);