Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101842/?format=api
{ "id": 101842, "url": "http://patchwork.dpdk.org/api/patches/101842/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20211015192408.21798-3-olivier.matz@6wind.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20211015192408.21798-3-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211015192408.21798-3-olivier.matz@6wind.com", "date": "2021-10-15T19:24:06", "name": "[v2,2/4] mbuf: mark old VLAN offload flags as deprecated", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0ecf25c6c07143e5882e5f4984d340fef7b1ba4e", "submitter": { "id": 8, "url": "http://patchwork.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": { "id": 24651, "url": "http://patchwork.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20211015192408.21798-3-olivier.matz@6wind.com/mbox/", "series": [ { "id": 19704, "url": "http://patchwork.dpdk.org/api/series/19704/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=19704", "date": "2021-10-15T19:24:04", "name": "mbuf: offload flags namespace", "version": 2, "mbox": "http://patchwork.dpdk.org/series/19704/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/101842/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/101842/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 204D3A0C43;\n\tFri, 15 Oct 2021 21:24:40 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0BA6B4114B;\n\tFri, 15 Oct 2021 21:24:33 +0200 (CEST)", "from mail-wr1-f49.google.com (mail-wr1-f49.google.com\n [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 107DC41135\n for <dev@dpdk.org>; Fri, 15 Oct 2021 21:24:30 +0200 (CEST)", "by mail-wr1-f49.google.com with SMTP id u18so28271990wrg.5\n for <dev@dpdk.org>; Fri, 15 Oct 2021 12:24:30 -0700 (PDT)", "from gojira.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.\n [62.23.145.78])\n by smtp.gmail.com with ESMTPSA id s186sm6335862wme.14.2021.10.15.12.24.28\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 15 Oct 2021 12:24:29 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=bgFNygAgiNevhM+4eOKF956hVaIcA63PWSTFVvd0ARQ=;\n b=KabJnEvpyUJUa1ZkpIaBh3TdXvi2oVJYR/2r1q+IbxrJZH4K4lM+H1qMvxeNFLVO7a\n lNRqtu+touCkhy0Dwso8g9aAr1Ep6Evkd6+ETKOAk9KbRgGGVTg2s+G5G5hmnqnh5vN7\n PDtaq6vbOZO3SThfH8cxoWjkcGk2cv+3G6m0rZf7hgSFB1thF50zdEp+5TXzJs+oQTOC\n qZV49PsEEOL1bX9UgZOyWeJPABOiyUpwlLuYZuiy83vPwFbnjYoivfSpvFZkyZ/KNemt\n O8QWaAPKYA00qwngHuZvB8raR3hNGpHtzFnffMRzOayXMWqmDWRqsBciidkiR5bed3Ye\n lEyg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=bgFNygAgiNevhM+4eOKF956hVaIcA63PWSTFVvd0ARQ=;\n b=I0A6gjRQOcGIjB8h79ON63A404dDegJAZ+YFMvOs8pBSI4rd6TvkYOc+IV2MxHTDjm\n ql7B1nBys+VZVwDHE+4aAEEIDsAM9IwHN45NGGFv+nLiHEG/EOaE/XomuxsC3HzyQVU0\n p5eds6U9uKFT4L1r1AjsQWBVaB9uvPKqRYh+XccGfGGA9poQNLUMI551V45nBKzG/t6C\n qQ4yYK/So0f5necX64KajsfMXae85SgPo0Yp1wXa4x/UJueJ/QsiYAl9uzxMR+5zmVhD\n 2In3O2qhd4G4MPBREX5b3Sofzwtdv2MMhnpd79mnJJZNiqYcZg9rWRGVEYfc9UmrUAm9\n Z4zw==", "X-Gm-Message-State": "AOAM5321qIROV/v8veIYW3cG0QEfT71LrdBuIAIz4Ds1pzZqvajVDNpt\n 9bPHbE07X9lTba4ZAd5w3ekucalJcI2l8d+7", "X-Google-Smtp-Source": "\n ABdhPJzrsbADgBOSn2nuElDal1ARruSHHdQjVvWwusGYVnv41UIm7AKfMIwP6rbuZjWd8VdK0Xlk5A==", "X-Received": "by 2002:adf:ba0d:: with SMTP id\n o13mr16304789wrg.339.1634325869631;\n Fri, 15 Oct 2021 12:24:29 -0700 (PDT)", "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Cc": "David Marchand <david.marchand@redhat.com>", "Date": "Fri, 15 Oct 2021 21:24:06 +0200", "Message-Id": "<20211015192408.21798-3-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20211015192408.21798-1-olivier.matz@6wind.com>", "References": "<20210929214817.18082-1-olivier.matz@6wind.com>\n <20211015192408.21798-1-olivier.matz@6wind.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 2/4] mbuf: mark old VLAN offload flags as\n deprecated", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The flags PKT_TX_VLAN_PKT and PKT_TX_QINQ_PKT are\nmarked as deprecated since commit 380a7aab1ae2 (\"mbuf: rename deprecated\nVLAN flags\") (2017). But they were not using the RTE_DEPRECATED\nmacro, because it did not exist at this time. Add it, and replace\nusage of these flags.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n app/test-pmd/flowgen.c | 4 ++--\n app/test-pmd/macfwd.c | 4 ++--\n app/test-pmd/txonly.c | 4 ++--\n drivers/net/af_packet/rte_eth_af_packet.c | 2 +-\n drivers/net/avp/avp_ethdev.c | 4 ++--\n drivers/net/axgbe/axgbe_rxtx.c | 2 +-\n drivers/net/bnx2x/bnx2x.c | 2 +-\n drivers/net/bnxt/bnxt_txr.c | 8 ++++----\n drivers/net/cxgbe/sge.c | 4 ++--\n drivers/net/dpaa2/dpaa2_rxtx.c | 6 +++---\n drivers/net/e1000/em_rxtx.c | 4 ++--\n drivers/net/e1000/igb_rxtx.c | 6 +++---\n drivers/net/fm10k/fm10k_rxtx.c | 4 ++--\n drivers/net/hinic/hinic_pmd_tx.c | 2 +-\n drivers/net/hns3/hns3_rxtx.c | 14 ++++++-------\n drivers/net/i40e/i40e_rxtx.c | 10 +++++-----\n drivers/net/iavf/iavf_rxtx.c | 6 +++---\n drivers/net/iavf/iavf_rxtx.h | 2 +-\n drivers/net/igc/igc_txrx.c | 6 +++---\n drivers/net/ionic/ionic_rxtx.c | 4 ++--\n drivers/net/ixgbe/ixgbe_rxtx.c | 6 +++---\n drivers/net/mlx5/mlx5_tx.h | 24 +++++++++++------------\n drivers/net/netvsc/hn_rxtx.c | 2 +-\n drivers/net/nfp/nfp_rxtx.c | 2 +-\n drivers/net/qede/qede_rxtx.c | 2 +-\n drivers/net/qede/qede_rxtx.h | 2 +-\n drivers/net/sfc/sfc_ef100_tx.c | 4 ++--\n drivers/net/sfc/sfc_ef10_tx.c | 2 +-\n drivers/net/sfc/sfc_tx.c | 2 +-\n drivers/net/txgbe/txgbe_rxtx.c | 8 ++++----\n drivers/net/vhost/rte_eth_vhost.c | 2 +-\n drivers/net/virtio/virtio_rxtx.c | 2 +-\n drivers/net/vmxnet3/vmxnet3_rxtx.c | 4 ++--\n examples/vhost/main.c | 2 +-\n lib/mbuf/rte_mbuf_core.h | 8 ++++----\n 35 files changed, 85 insertions(+), 85 deletions(-)", "diff": "diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c\nindex a96169e680..0ce2afbea5 100644\n--- a/app/test-pmd/flowgen.c\n+++ b/app/test-pmd/flowgen.c\n@@ -100,9 +100,9 @@ pkt_burst_flow_gen(struct fwd_stream *fs)\n \n \ttx_offloads = ports[fs->tx_port].dev_conf.txmode.offloads;\n \tif (tx_offloads\t& DEV_TX_OFFLOAD_VLAN_INSERT)\n-\t\tol_flags |= PKT_TX_VLAN_PKT;\n+\t\tol_flags |= PKT_TX_VLAN;\n \tif (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)\n-\t\tol_flags |= PKT_TX_QINQ_PKT;\n+\t\tol_flags |= PKT_TX_QINQ;\n \tif (tx_offloads\t& DEV_TX_OFFLOAD_MACSEC_INSERT)\n \t\tol_flags |= PKT_TX_MACSEC;\n \ndiff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c\nindex ee76df7f03..a67907b449 100644\n--- a/app/test-pmd/macfwd.c\n+++ b/app/test-pmd/macfwd.c\n@@ -73,9 +73,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs)\n \ttxp = &ports[fs->tx_port];\n \ttx_offloads = txp->dev_conf.txmode.offloads;\n \tif (tx_offloads\t& DEV_TX_OFFLOAD_VLAN_INSERT)\n-\t\tol_flags = PKT_TX_VLAN_PKT;\n+\t\tol_flags = PKT_TX_VLAN;\n \tif (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)\n-\t\tol_flags |= PKT_TX_QINQ_PKT;\n+\t\tol_flags |= PKT_TX_QINQ;\n \tif (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT)\n \t\tol_flags |= PKT_TX_MACSEC;\n \tfor (i = 0; i < nb_rx; i++) {\ndiff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c\nindex 40655801cc..0e44bc4d3b 100644\n--- a/app/test-pmd/txonly.c\n+++ b/app/test-pmd/txonly.c\n@@ -353,9 +353,9 @@ pkt_burst_transmit(struct fwd_stream *fs)\n \tvlan_tci = txp->tx_vlan_id;\n \tvlan_tci_outer = txp->tx_vlan_id_outer;\n \tif (tx_offloads\t& DEV_TX_OFFLOAD_VLAN_INSERT)\n-\t\tol_flags = PKT_TX_VLAN_PKT;\n+\t\tol_flags = PKT_TX_VLAN;\n \tif (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)\n-\t\tol_flags |= PKT_TX_QINQ_PKT;\n+\t\tol_flags |= PKT_TX_QINQ;\n \tif (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT)\n \t\tol_flags |= PKT_TX_MACSEC;\n \ndiff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c\nindex a077376dc0..931fc230e5 100644\n--- a/drivers/net/af_packet/rte_eth_af_packet.c\n+++ b/drivers/net/af_packet/rte_eth_af_packet.c\n@@ -229,7 +229,7 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t}\n \n \t\t/* insert vlan info if necessary */\n-\t\tif (mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\tif (mbuf->ol_flags & PKT_TX_VLAN) {\n \t\t\tif (rte_vlan_insert(&mbuf)) {\n \t\t\t\trte_pktmbuf_free(mbuf);\n \t\t\t\tcontinue;\ndiff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c\nindex 6cb8bb4338..6f0dafc287 100644\n--- a/drivers/net/avp/avp_ethdev.c\n+++ b/drivers/net/avp/avp_ethdev.c\n@@ -1674,7 +1674,7 @@ avp_dev_copy_to_buffers(struct avp_dev *avp,\n \tfirst_buf->nb_segs = count;\n \tfirst_buf->pkt_len = total_length;\n \n-\tif (mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (mbuf->ol_flags & PKT_TX_VLAN) {\n \t\tfirst_buf->ol_flags |= RTE_AVP_TX_VLAN_PKT;\n \t\tfirst_buf->vlan_tci = mbuf->vlan_tci;\n \t}\n@@ -1905,7 +1905,7 @@ avp_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\tpkt_buf->nb_segs = 1;\n \t\tpkt_buf->next = NULL;\n \n-\t\tif (m->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\tif (m->ol_flags & PKT_TX_VLAN) {\n \t\t\tpkt_buf->ol_flags |= RTE_AVP_TX_VLAN_PKT;\n \t\t\tpkt_buf->vlan_tci = m->vlan_tci;\n \t\t}\ndiff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c\nindex c8618d2d6d..c9d5800b01 100644\n--- a/drivers/net/axgbe/axgbe_rxtx.c\n+++ b/drivers/net/axgbe/axgbe_rxtx.c\n@@ -811,7 +811,7 @@ static int axgbe_xmit_hw(struct axgbe_tx_queue *txq,\n \t\tAXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CIC, 0x1);\n \trte_wmb();\n \n-\tif (mbuf->ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) {\n+\tif (mbuf->ol_flags & (PKT_TX_VLAN | PKT_TX_QINQ)) {\n \t\t/* Mark it as a CONTEXT descriptor */\n \t\tAXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3,\n \t\t\t\t CTXT, 1);\ndiff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c\nindex 083deff1b1..819e54044b 100644\n--- a/drivers/net/bnx2x/bnx2x.c\n+++ b/drivers/net/bnx2x/bnx2x.c\n@@ -2189,7 +2189,7 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)\n \n \ttx_start_bd->nbd = rte_cpu_to_le_16(2);\n \n-\tif (m0->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (m0->ol_flags & PKT_TX_VLAN) {\n \t\ttx_start_bd->vlan_or_ethertype =\n \t\t rte_cpu_to_le_16(m0->vlan_tci);\n \t\ttx_start_bd->bd_flags.as_bitfield |=\ndiff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c\nindex 9e45ddd7a8..e36da59fce 100644\n--- a/drivers/net/bnxt/bnxt_txr.c\n+++ b/drivers/net/bnxt/bnxt_txr.c\n@@ -113,10 +113,10 @@ bnxt_xmit_need_long_bd(struct rte_mbuf *tx_pkt, struct bnxt_tx_queue *txq)\n {\n \tif (tx_pkt->ol_flags & (PKT_TX_TCP_SEG | PKT_TX_TCP_CKSUM |\n \t\t\t\tPKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM |\n-\t\t\t\tPKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |\n+\t\t\t\tPKT_TX_VLAN | PKT_TX_OUTER_IP_CKSUM |\n \t\t\t\tPKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |\n \t\t\t\tPKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |\n-\t\t\t\tPKT_TX_QINQ_PKT) ||\n+\t\t\t\tPKT_TX_QINQ) ||\n \t (BNXT_TRUFLOW_EN(txq->bp) &&\n \t (txq->bp->tx_cfa_action || txq->vfr_tx_cfa_action)))\n \t\treturn true;\n@@ -203,13 +203,13 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,\n \t\tvlan_tag_flags = 0;\n \n \t\t/* HW can accelerate only outer vlan in QinQ mode */\n-\t\tif (tx_pkt->ol_flags & PKT_TX_QINQ_PKT) {\n+\t\tif (tx_pkt->ol_flags & PKT_TX_QINQ) {\n \t\t\tvlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |\n \t\t\t\ttx_pkt->vlan_tci_outer;\n \t\t\touter_tpid_bd = txq->bp->outer_tpid_bd &\n \t\t\t\tBNXT_OUTER_TPID_BD_MASK;\n \t\t\tvlan_tag_flags |= outer_tpid_bd;\n-\t\t} else if (tx_pkt->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\t} else if (tx_pkt->ol_flags & PKT_TX_VLAN) {\n \t\t\t/* shurd: Should this mask at\n \t\t\t * TX_BD_LONG_CFA_META_VLAN_VID_MASK?\n \t\t\t */\ndiff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c\nindex e5f7721dc4..3299d6252e 100644\n--- a/drivers/net/cxgbe/sge.c\n+++ b/drivers/net/cxgbe/sge.c\n@@ -1037,7 +1037,7 @@ static inline int tx_do_packet_coalesce(struct sge_eth_txq *txq,\n \t\tcntrl = F_TXPKT_L4CSUM_DIS | F_TXPKT_IPCSUM_DIS;\n \t}\n \n-\tif (mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (mbuf->ol_flags & PKT_TX_VLAN) {\n \t\ttxq->stats.vlan_ins++;\n \t\tcntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(mbuf->vlan_tci);\n \t}\n@@ -1258,7 +1258,7 @@ int t4_eth_xmit(struct sge_eth_txq *txq, struct rte_mbuf *mbuf,\n \t\ttxq->stats.tx_cso += m->tso_segsz;\n \t}\n \n-\tif (m->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (m->ol_flags & PKT_TX_VLAN) {\n \t\ttxq->stats.vlan_ins++;\n \t\tcntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(m->vlan_tci);\n \t}\ndiff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c\nindex f40369e2c3..f491f4d10a 100644\n--- a/drivers/net/dpaa2/dpaa2_rxtx.c\n+++ b/drivers/net/dpaa2/dpaa2_rxtx.c\n@@ -1228,7 +1228,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t (*bufs)->nb_segs == 1 &&\n \t\t\t\t rte_mbuf_refcnt_read((*bufs)) == 1)) {\n \t\t\t\t\tif (unlikely(((*bufs)->ol_flags\n-\t\t\t\t\t\t& PKT_TX_VLAN_PKT) ||\n+\t\t\t\t\t\t& PKT_TX_VLAN) ||\n \t\t\t\t\t\t(eth_data->dev_conf.txmode.offloads\n \t\t\t\t\t\t& DEV_TX_OFFLOAD_VLAN_INSERT))) {\n \t\t\t\t\t\tret = rte_vlan_insert(bufs);\n@@ -1271,7 +1271,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\tgoto send_n_return;\n \t\t\t}\n \n-\t\t\tif (unlikely(((*bufs)->ol_flags & PKT_TX_VLAN_PKT) ||\n+\t\t\tif (unlikely(((*bufs)->ol_flags & PKT_TX_VLAN) ||\n \t\t\t\t(eth_data->dev_conf.txmode.offloads\n \t\t\t\t& DEV_TX_OFFLOAD_VLAN_INSERT))) {\n \t\t\t\tint ret = rte_vlan_insert(bufs);\n@@ -1532,7 +1532,7 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t (*bufs)->nb_segs == 1 &&\n \t\t\t\t rte_mbuf_refcnt_read((*bufs)) == 1)) {\n \t\t\t\t\tif (unlikely((*bufs)->ol_flags\n-\t\t\t\t\t\t& PKT_TX_VLAN_PKT)) {\n+\t\t\t\t\t\t& PKT_TX_VLAN)) {\n \t\t\t\t\t ret = rte_vlan_insert(bufs);\n \t\t\t\t\t if (ret)\n \t\t\t\t\t\tgoto send_n_return;\ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex 8542a15320..82873c91b0 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -55,7 +55,7 @@\n \t\tPKT_TX_IPV4 | \\\n \t\tPKT_TX_IP_CKSUM | \\\n \t\tPKT_TX_L4_MASK | \\\n-\t\tPKT_TX_VLAN_PKT)\n+\t\tPKT_TX_VLAN)\n \n #define E1000_TX_OFFLOAD_NOTSUP_MASK \\\n \t\t(PKT_TX_OFFLOAD_MASK ^ E1000_TX_OFFLOAD_MASK)\n@@ -508,7 +508,7 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tpopts_spec = 0;\n \n \t\t/* Set VLAN Tag offload fields. */\n-\t\tif (ol_flags & PKT_TX_VLAN_PKT) {\n+\t\tif (ol_flags & PKT_TX_VLAN) {\n \t\t\tcmd_type_len |= E1000_TXD_CMD_VLE;\n \t\t\tpopts_spec = tx_pkt->vlan_tci << E1000_TXD_VLAN_SHIFT;\n \t\t}\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex 8d64d7397a..fa2797074f 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -54,7 +54,7 @@\n \t\tPKT_TX_OUTER_IPV4 |\t \\\n \t\tPKT_TX_IPV6 |\t\t \\\n \t\tPKT_TX_IPV4 |\t\t \\\n-\t\tPKT_TX_VLAN_PKT |\t\t \\\n+\t\tPKT_TX_VLAN |\t\t \\\n \t\tPKT_TX_IP_CKSUM |\t\t \\\n \t\tPKT_TX_L4_MASK |\t\t \\\n \t\tPKT_TX_TCP_SEG |\t\t \\\n@@ -262,7 +262,7 @@ igbe_set_xmit_ctx(struct igb_tx_queue* txq,\n \t/* Specify which HW CTX to upload. */\n \tmss_l4len_idx = (ctx_idx << E1000_ADVTXD_IDX_SHIFT);\n \n-\tif (ol_flags & PKT_TX_VLAN_PKT)\n+\tif (ol_flags & PKT_TX_VLAN)\n \t\ttx_offload_mask.data |= TX_VLAN_CMP_MASK;\n \n \t/* check if TCP segmentation required for this packet */\n@@ -371,7 +371,7 @@ tx_desc_vlan_flags_to_cmdtype(uint64_t ol_flags)\n \tuint32_t cmdtype;\n \tstatic uint32_t vlan_cmd[2] = {0, E1000_ADVTXD_DCMD_VLE};\n \tstatic uint32_t tso_cmd[2] = {0, E1000_ADVTXD_DCMD_TSE};\n-\tcmdtype = vlan_cmd[(ol_flags & PKT_TX_VLAN_PKT) != 0];\n+\tcmdtype = vlan_cmd[(ol_flags & PKT_TX_VLAN) != 0];\n \tcmdtype |= tso_cmd[(ol_flags & PKT_TX_TCP_SEG) != 0];\n \treturn cmdtype;\n }\ndiff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c\nindex 0a9a27aa5a..496e72a003 100644\n--- a/drivers/net/fm10k/fm10k_rxtx.c\n+++ b/drivers/net/fm10k/fm10k_rxtx.c\n@@ -38,7 +38,7 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)\n #endif\n \n #define FM10K_TX_OFFLOAD_MASK ( \\\n-\t\tPKT_TX_VLAN_PKT | \\\n+\t\tPKT_TX_VLAN | \\\n \t\tPKT_TX_IPV6 | \\\n \t\tPKT_TX_IPV4 | \\\n \t\tPKT_TX_IP_CKSUM | \\\n@@ -609,7 +609,7 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb)\n \t\tq->hw_ring[q->next_free].flags |= FM10K_TXD_FLAG_CSUM;\n \n \t/* set vlan if requested */\n-\tif (mb->ol_flags & PKT_TX_VLAN_PKT)\n+\tif (mb->ol_flags & PKT_TX_VLAN)\n \t\tq->hw_ring[q->next_free].vlan = mb->vlan_tci;\n \telse\n \t\tq->hw_ring[q->next_free].vlan = 0;\ndiff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c\nindex 669f82389c..e14937139d 100644\n--- a/drivers/net/hinic/hinic_pmd_tx.c\n+++ b/drivers/net/hinic/hinic_pmd_tx.c\n@@ -592,7 +592,7 @@ hinic_fill_tx_offload_info(struct rte_mbuf *mbuf,\n \ttask->pkt_info2 = 0;\n \n \t/* Base VLAN */\n-\tif (unlikely(ol_flags & PKT_TX_VLAN_PKT)) {\n+\tif (unlikely(ol_flags & PKT_TX_VLAN)) {\n \t\tvlan_tag = mbuf->vlan_tci;\n \t\thinic_set_vlan_tx_offload(task, queue_info, vlan_tag,\n \t\t\t\t\t vlan_tag >> VLAN_PRIO_SHIFT);\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 6b77672aa1..feac7eb218 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -3202,11 +3202,11 @@ hns3_fill_first_desc(struct hns3_tx_queue *txq, struct hns3_desc *desc,\n \t * To avoid the VLAN of Tx descriptor is overwritten by PVID, it should\n \t * be added to the position close to the IP header when PVID is enabled.\n \t */\n-\tif (!txq->pvid_sw_shift_en && ol_flags & (PKT_TX_VLAN_PKT |\n-\t\t\t\tPKT_TX_QINQ_PKT)) {\n+\tif (!txq->pvid_sw_shift_en && ol_flags & (PKT_TX_VLAN |\n+\t\t\t\tPKT_TX_QINQ)) {\n \t\tdesc->tx.ol_type_vlan_len_msec |=\n \t\t\t\trte_cpu_to_le_32(BIT(HNS3_TXD_OVLAN_B));\n-\t\tif (ol_flags & PKT_TX_QINQ_PKT)\n+\t\tif (ol_flags & PKT_TX_QINQ)\n \t\t\tdesc->tx.outer_vlan_tag =\n \t\t\t\t\trte_cpu_to_le_16(rxm->vlan_tci_outer);\n \t\telse\n@@ -3214,8 +3214,8 @@ hns3_fill_first_desc(struct hns3_tx_queue *txq, struct hns3_desc *desc,\n \t\t\t\t\trte_cpu_to_le_16(rxm->vlan_tci);\n \t}\n \n-\tif (ol_flags & PKT_TX_QINQ_PKT ||\n-\t ((ol_flags & PKT_TX_VLAN_PKT) && txq->pvid_sw_shift_en)) {\n+\tif (ol_flags & PKT_TX_QINQ ||\n+\t ((ol_flags & PKT_TX_VLAN) && txq->pvid_sw_shift_en)) {\n \t\tdesc->tx.type_cs_vlan_tso_len |=\n \t\t\t\t\trte_cpu_to_le_32(BIT(HNS3_TXD_VLAN_B));\n \t\tdesc->tx.vlan_tag = rte_cpu_to_le_16(rxm->vlan_tci);\n@@ -3754,12 +3754,12 @@ hns3_vld_vlan_chk(struct hns3_tx_queue *txq, struct rte_mbuf *m)\n \t * implementation function named hns3_prep_pkts to inform users that\n \t * these packets will be discarded.\n \t */\n-\tif (m->ol_flags & PKT_TX_QINQ_PKT)\n+\tif (m->ol_flags & PKT_TX_QINQ)\n \t\treturn -EINVAL;\n \n \teh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);\n \tif (eh->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {\n-\t\tif (m->ol_flags & PKT_TX_VLAN_PKT)\n+\t\tif (m->ol_flags & PKT_TX_VLAN)\n \t\t\treturn -EINVAL;\n \n \t\t/* Ensure the incoming packet is not a QinQ packet */\ndiff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c\nindex 807e1a4133..c858354b73 100644\n--- a/drivers/net/i40e/i40e_rxtx.c\n+++ b/drivers/net/i40e/i40e_rxtx.c\n@@ -64,8 +64,8 @@\n \t\tPKT_TX_L4_MASK | \\\n \t\tPKT_TX_OUTER_IP_CKSUM | \\\n \t\tPKT_TX_TCP_SEG | \\\n-\t\tPKT_TX_QINQ_PKT | \\\n-\t\tPKT_TX_VLAN_PKT |\t\\\n+\t\tPKT_TX_QINQ | \\\n+\t\tPKT_TX_VLAN |\t\\\n \t\tPKT_TX_TUNNEL_MASK |\t\\\n \t\tI40E_TX_IEEE1588_TMST)\n \n@@ -1006,7 +1006,7 @@ i40e_calc_context_desc(uint64_t flags)\n {\n \tstatic uint64_t mask = PKT_TX_OUTER_IP_CKSUM |\n \t\tPKT_TX_TCP_SEG |\n-\t\tPKT_TX_QINQ_PKT |\n+\t\tPKT_TX_QINQ |\n \t\tPKT_TX_TUNNEL_MASK;\n \n #ifdef RTE_LIBRTE_IEEE1588\n@@ -1151,7 +1151,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t}\n \n \t\t/* Descriptor based VLAN insertion */\n-\t\tif (ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) {\n+\t\tif (ol_flags & (PKT_TX_VLAN | PKT_TX_QINQ)) {\n \t\t\ttd_cmd |= I40E_TX_DESC_CMD_IL2TAG1;\n \t\t\ttd_tag = tx_pkt->vlan_tci;\n \t\t}\n@@ -1200,7 +1200,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \n \t\t\tctx_txd->tunneling_params =\n \t\t\t\trte_cpu_to_le_32(cd_tunneling_params);\n-\t\t\tif (ol_flags & PKT_TX_QINQ_PKT) {\n+\t\t\tif (ol_flags & PKT_TX_QINQ) {\n \t\t\t\tcd_l2tag2 = tx_pkt->vlan_tci_outer;\n \t\t\t\tcd_type_cmd_tso_mss |=\n \t\t\t\t\t((uint64_t)I40E_TX_CTX_DESC_IL2TAG2 <<\ndiff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c\nindex 88661e5d74..045fd92368 100644\n--- a/drivers/net/iavf/iavf_rxtx.c\n+++ b/drivers/net/iavf/iavf_rxtx.c\n@@ -2074,7 +2074,7 @@ iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)\n {\n \tif (flags & PKT_TX_TCP_SEG)\n \t\treturn 1;\n-\tif (flags & PKT_TX_VLAN_PKT &&\n+\tif (flags & PKT_TX_VLAN &&\n \t vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2)\n \t\treturn 1;\n \treturn 0;\n@@ -2260,7 +2260,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t}\n \n \t\t/* Descriptor based VLAN insertion */\n-\t\tif (ol_flags & PKT_TX_VLAN_PKT &&\n+\t\tif (ol_flags & PKT_TX_VLAN &&\n \t\t txq->vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG1) {\n \t\t\ttd_cmd |= IAVF_TX_DESC_CMD_IL2TAG1;\n \t\t\ttd_tag = tx_pkt->vlan_tci;\n@@ -2301,7 +2301,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t\t\tcd_type_cmd_tso_mss |=\n \t\t\t\t\tiavf_set_tso_ctx(tx_pkt, tx_offload);\n \n-\t\t\tif (ol_flags & PKT_TX_VLAN_PKT &&\n+\t\t\tif (ol_flags & PKT_TX_VLAN &&\n \t\t\t txq->vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2) {\n \t\t\t\tcd_type_cmd_tso_mss |= IAVF_TX_CTX_DESC_IL2TAG2\n \t\t\t\t\t<< IAVF_TXD_CTX_QW1_CMD_SHIFT;\ndiff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h\nindex c7a868cf1d..229a2ea4dd 100644\n--- a/drivers/net/iavf/iavf_rxtx.h\n+++ b/drivers/net/iavf/iavf_rxtx.h\n@@ -62,7 +62,7 @@\n \t\tPKT_TX_OUTER_IPV4 |\t\t \\\n \t\tPKT_TX_IPV6 |\t\t\t \\\n \t\tPKT_TX_IPV4 |\t\t\t \\\n-\t\tPKT_TX_VLAN_PKT |\t\t \\\n+\t\tPKT_TX_VLAN |\t\t \\\n \t\tPKT_TX_IP_CKSUM |\t\t \\\n \t\tPKT_TX_L4_MASK |\t\t \\\n \t\tPKT_TX_TCP_SEG)\ndiff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c\nindex 7dee1bb0fa..97656b39fd 100644\n--- a/drivers/net/igc/igc_txrx.c\n+++ b/drivers/net/igc/igc_txrx.c\n@@ -78,7 +78,7 @@\n \t\tPKT_TX_OUTER_IPV4 |\t\\\n \t\tPKT_TX_IPV6 |\t\t\\\n \t\tPKT_TX_IPV4 |\t\t\\\n-\t\tPKT_TX_VLAN_PKT |\t\\\n+\t\tPKT_TX_VLAN |\t\\\n \t\tPKT_TX_IP_CKSUM |\t\\\n \t\tPKT_TX_L4_MASK |\t\\\n \t\tPKT_TX_TCP_SEG |\t\\\n@@ -1530,7 +1530,7 @@ igc_set_xmit_ctx(struct igc_tx_queue *txq,\n \t/* Specify which HW CTX to upload. */\n \tmss_l4len_idx = (ctx_curr << IGC_ADVTXD_IDX_SHIFT);\n \n-\tif (ol_flags & PKT_TX_VLAN_PKT)\n+\tif (ol_flags & PKT_TX_VLAN)\n \t\ttx_offload_mask.vlan_tci = 0xffff;\n \n \t/* check if TCP segmentation required for this packet */\n@@ -1604,7 +1604,7 @@ tx_desc_vlan_flags_to_cmdtype(uint64_t ol_flags)\n \tuint32_t cmdtype;\n \tstatic uint32_t vlan_cmd[2] = {0, IGC_ADVTXD_DCMD_VLE};\n \tstatic uint32_t tso_cmd[2] = {0, IGC_ADVTXD_DCMD_TSE};\n-\tcmdtype = vlan_cmd[(ol_flags & PKT_TX_VLAN_PKT) != 0];\n+\tcmdtype = vlan_cmd[(ol_flags & PKT_TX_VLAN) != 0];\n \tcmdtype |= tso_cmd[(ol_flags & IGC_TX_OFFLOAD_SEG) != 0];\n \treturn cmdtype;\n }\ndiff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c\nindex 67631a5813..001a368856 100644\n--- a/drivers/net/ionic/ionic_rxtx.c\n+++ b/drivers/net/ionic/ionic_rxtx.c\n@@ -355,7 +355,7 @@ ionic_tx_tso(struct ionic_tx_qcq *txq, struct rte_mbuf *txm)\n \tuint32_t offset = 0;\n \tbool start, done;\n \tbool encap;\n-\tbool has_vlan = !!(txm->ol_flags & PKT_TX_VLAN_PKT);\n+\tbool has_vlan = !!(txm->ol_flags & PKT_TX_VLAN);\n \tuint16_t vlan_tci = txm->vlan_tci;\n \tuint64_t ol_flags = txm->ol_flags;\n \n@@ -494,7 +494,7 @@ ionic_tx(struct ionic_tx_qcq *txq, struct rte_mbuf *txm)\n \tif (opcode == IONIC_TXQ_DESC_OPCODE_CSUM_NONE)\n \t\tstats->no_csum++;\n \n-\thas_vlan = (ol_flags & PKT_TX_VLAN_PKT);\n+\thas_vlan = (ol_flags & PKT_TX_VLAN);\n \tencap = ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||\n \t\t\t(ol_flags & PKT_TX_OUTER_UDP_CKSUM)) &&\n \t\t\t((ol_flags & PKT_TX_OUTER_IPV4) ||\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex 349180e7c1..0e3aec9906 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -64,7 +64,7 @@\n \t\tPKT_TX_OUTER_IPV4 |\t\t \\\n \t\tPKT_TX_IPV6 |\t\t\t \\\n \t\tPKT_TX_IPV4 |\t\t\t \\\n-\t\tPKT_TX_VLAN_PKT |\t\t \\\n+\t\tPKT_TX_VLAN |\t\t \\\n \t\tPKT_TX_IP_CKSUM |\t\t \\\n \t\tPKT_TX_L4_MASK |\t\t \\\n \t\tPKT_TX_TCP_SEG |\t\t \\\n@@ -384,7 +384,7 @@ ixgbe_set_xmit_ctx(struct ixgbe_tx_queue *txq,\n \t/* Specify which HW CTX to upload. */\n \tmss_l4len_idx |= (ctx_idx << IXGBE_ADVTXD_IDX_SHIFT);\n \n-\tif (ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (ol_flags & PKT_TX_VLAN) {\n \t\ttx_offload_mask.vlan_tci |= ~0;\n \t}\n \n@@ -543,7 +543,7 @@ tx_desc_ol_flags_to_cmdtype(uint64_t ol_flags)\n {\n \tuint32_t cmdtype = 0;\n \n-\tif (ol_flags & PKT_TX_VLAN_PKT)\n+\tif (ol_flags & PKT_TX_VLAN)\n \t\tcmdtype |= IXGBE_ADVTXD_DCMD_VLE;\n \tif (ol_flags & PKT_TX_TCP_SEG)\n \t\tcmdtype |= IXGBE_ADVTXD_DCMD_TSE;\ndiff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h\nindex e722738682..4f83291cc2 100644\n--- a/drivers/net/mlx5/mlx5_tx.h\n+++ b/drivers/net/mlx5/mlx5_tx.h\n@@ -538,7 +538,7 @@ txq_mbuf_to_swp(struct mlx5_txq_local *__rte_restrict loc,\n \t * should be set regardless of HW offload.\n \t */\n \toff = loc->mbuf->outer_l2_len;\n-\tif (MLX5_TXOFF_CONFIG(VLAN) && ol & PKT_TX_VLAN_PKT)\n+\tif (MLX5_TXOFF_CONFIG(VLAN) && ol & PKT_TX_VLAN)\n \t\toff += sizeof(struct rte_vlan_hdr);\n \tset = (off >> 1) << 8; /* Outer L3 offset. */\n \toff += loc->mbuf->outer_l3_len;\n@@ -957,7 +957,7 @@ mlx5_tx_eseg_none(struct mlx5_txq_data *__rte_restrict txq __rte_unused,\n \t\t 0 : 0;\n \t/* Engage VLAN tag insertion feature if requested. */\n \tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t loc->mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\t loc->mbuf->ol_flags & PKT_TX_VLAN) {\n \t\t/*\n \t\t * We should get here only if device support\n \t\t * this feature correctly.\n@@ -1818,7 +1818,7 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq,\n \t * the required space in WQE ring buffer.\n \t */\n \tdlen = rte_pktmbuf_pkt_len(loc->mbuf);\n-\tif (MLX5_TXOFF_CONFIG(VLAN) && loc->mbuf->ol_flags & PKT_TX_VLAN_PKT)\n+\tif (MLX5_TXOFF_CONFIG(VLAN) && loc->mbuf->ol_flags & PKT_TX_VLAN)\n \t\tvlan = sizeof(struct rte_vlan_hdr);\n \tinlen = loc->mbuf->l2_len + vlan +\n \t\tloc->mbuf->l3_len + loc->mbuf->l4_len;\n@@ -1933,7 +1933,7 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq,\n \t/* Update sent data bytes counter. */\n \ttxq->stats.obytes += rte_pktmbuf_pkt_len(loc->mbuf);\n \tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t loc->mbuf->ol_flags & PKT_TX_VLAN_PKT)\n+\t loc->mbuf->ol_flags & PKT_TX_VLAN)\n \t\ttxq->stats.obytes += sizeof(struct rte_vlan_hdr);\n #endif\n \t/*\n@@ -2032,7 +2032,7 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq,\n \t * to estimate the required space for WQE.\n \t */\n \tdlen = rte_pktmbuf_pkt_len(loc->mbuf);\n-\tif (MLX5_TXOFF_CONFIG(VLAN) && loc->mbuf->ol_flags & PKT_TX_VLAN_PKT)\n+\tif (MLX5_TXOFF_CONFIG(VLAN) && loc->mbuf->ol_flags & PKT_TX_VLAN)\n \t\tvlan = sizeof(struct rte_vlan_hdr);\n \tinlen = dlen + vlan;\n \t/* Check against minimal length. */\n@@ -2295,7 +2295,7 @@ mlx5_tx_burst_tso(struct mlx5_txq_data *__rte_restrict txq,\n \t\t}\n \t\tdlen = rte_pktmbuf_data_len(loc->mbuf);\n \t\tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t\t loc->mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\t loc->mbuf->ol_flags & PKT_TX_VLAN) {\n \t\t\tvlan = sizeof(struct rte_vlan_hdr);\n \t\t}\n \t\t/*\n@@ -2420,7 +2420,7 @@ mlx5_tx_able_to_empw(struct mlx5_txq_data *__rte_restrict txq,\n \t\treturn MLX5_TXCMP_CODE_SINGLE;\n \t/* Check if eMPW can be engaged. */\n \tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t unlikely(loc->mbuf->ol_flags & PKT_TX_VLAN_PKT) &&\n+\t unlikely(loc->mbuf->ol_flags & PKT_TX_VLAN) &&\n \t\t(!MLX5_TXOFF_CONFIG(INLINE) ||\n \t\t unlikely((rte_pktmbuf_data_len(loc->mbuf) +\n \t\t\t sizeof(struct rte_vlan_hdr)) > txq->inlen_empw))) {\n@@ -2482,7 +2482,7 @@ mlx5_tx_match_empw(struct mlx5_txq_data *__rte_restrict txq,\n \t\treturn false;\n \t/* There must be no VLAN packets in eMPW loop. */\n \tif (MLX5_TXOFF_CONFIG(VLAN))\n-\t\tMLX5_ASSERT(!(loc->mbuf->ol_flags & PKT_TX_VLAN_PKT));\n+\t\tMLX5_ASSERT(!(loc->mbuf->ol_flags & PKT_TX_VLAN));\n \t/* Check if the scheduling is requested. */\n \tif (MLX5_TXOFF_CONFIG(TXPP) &&\n \t loc->mbuf->ol_flags & txq->ts_mask)\n@@ -2943,7 +2943,7 @@ mlx5_tx_burst_empw_inline(struct mlx5_txq_data *__rte_restrict txq,\n \t\t\t}\n \t\t\t/* Inline entire packet, optional VLAN insertion. */\n \t\t\tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t\t\t loc->mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\t\t loc->mbuf->ol_flags & PKT_TX_VLAN) {\n \t\t\t\t/*\n \t\t\t\t * The packet length must be checked in\n \t\t\t\t * mlx5_tx_able_to_empw() and packet\n@@ -3008,7 +3008,7 @@ mlx5_tx_burst_empw_inline(struct mlx5_txq_data *__rte_restrict txq,\n \t\t\tMLX5_ASSERT(room >= MLX5_WQE_DSEG_SIZE);\n \t\t\tif (MLX5_TXOFF_CONFIG(VLAN))\n \t\t\t\tMLX5_ASSERT(!(loc->mbuf->ol_flags &\n-\t\t\t\t\t PKT_TX_VLAN_PKT));\n+\t\t\t\t\t PKT_TX_VLAN));\n \t\t\tmlx5_tx_dseg_ptr(txq, loc, dseg, dptr, dlen, olx);\n \t\t\t/* We have to store mbuf in elts.*/\n \t\t\ttxq->elts[txq->elts_head++ & txq->elts_m] = loc->mbuf;\n@@ -3153,7 +3153,7 @@ mlx5_tx_burst_single_send(struct mlx5_txq_data *__rte_restrict txq,\n \n \t\t\tinlen = rte_pktmbuf_data_len(loc->mbuf);\n \t\t\tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t\t\t loc->mbuf->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\t\t loc->mbuf->ol_flags & PKT_TX_VLAN) {\n \t\t\t\tvlan = sizeof(struct rte_vlan_hdr);\n \t\t\t\tinlen += vlan;\n \t\t\t}\n@@ -3384,7 +3384,7 @@ mlx5_tx_burst_single_send(struct mlx5_txq_data *__rte_restrict txq,\n \t\t\t/* Update sent data bytes counter. */\n \t\t\ttxq->stats.obytes += rte_pktmbuf_data_len(loc->mbuf);\n \t\t\tif (MLX5_TXOFF_CONFIG(VLAN) &&\n-\t\t\t loc->mbuf->ol_flags & PKT_TX_VLAN_PKT)\n+\t\t\t loc->mbuf->ol_flags & PKT_TX_VLAN)\n \t\t\t\ttxq->stats.obytes +=\n \t\t\t\t\tsizeof(struct rte_vlan_hdr);\n #endif\ndiff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c\nindex e880dc2bb2..acae68e082 100644\n--- a/drivers/net/netvsc/hn_rxtx.c\n+++ b/drivers/net/netvsc/hn_rxtx.c\n@@ -1331,7 +1331,7 @@ static void hn_encap(struct rndis_packet_msg *pkt,\n \t\t\t\t\t NDIS_PKTINFO_TYPE_HASHVAL);\n \t*pi_data = queue_id;\n \n-\tif (m->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (m->ol_flags & PKT_TX_VLAN) {\n \t\tpi_data = hn_rndis_pktinfo_append(pkt, NDIS_VLAN_INFO_SIZE,\n \t\t\t\t\t\t NDIS_PKTINFO_TYPE_VLAN);\n \t\t*pi_data = m->vlan_tci;\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex feeacb5614..0df300fe0d 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -935,7 +935,7 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\tnfp_net_tx_tso(txq, &txd, pkt);\n \t\tnfp_net_tx_cksum(txq, &txd, pkt);\n \n-\t\tif ((pkt->ol_flags & PKT_TX_VLAN_PKT) &&\n+\t\tif ((pkt->ol_flags & PKT_TX_VLAN) &&\n \t\t (hw->cap & NFP_NET_CFG_CTRL_TXVLAN)) {\n \t\t\ttxd.flags |= PCIE_DESC_TX_VLAN;\n \t\t\ttxd.vlan = pkt->vlan_tci;\ndiff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c\nindex 35cde561ba..050c6f5c32 100644\n--- a/drivers/net/qede/qede_rxtx.c\n+++ b/drivers/net/qede/qede_rxtx.c\n@@ -2587,7 +2587,7 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t}\n \n \t\t/* Descriptor based VLAN insertion */\n-\t\tif (tx_ol_flags & PKT_TX_VLAN_PKT) {\n+\t\tif (tx_ol_flags & PKT_TX_VLAN) {\n \t\t\tvlan = rte_cpu_to_le_16(mbuf->vlan_tci);\n \t\t\tbd1_bd_flags_bf |=\n \t\t\t 1 << ETH_TX_1ST_BD_FLAGS_VLAN_INSERTION_SHIFT;\ndiff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h\nindex c9334448c8..025ed6fff2 100644\n--- a/drivers/net/qede/qede_rxtx.h\n+++ b/drivers/net/qede/qede_rxtx.h\n@@ -153,7 +153,7 @@\n \t\t\t\t PKT_TX_IPV6)\n \n #define QEDE_TX_OFFLOAD_MASK (QEDE_TX_CSUM_OFFLOAD_MASK | \\\n-\t\t\t PKT_TX_VLAN_PKT\t\t| \\\n+\t\t\t PKT_TX_VLAN\t\t| \\\n \t\t\t PKT_TX_TUNNEL_MASK)\n \n #define QEDE_TX_OFFLOAD_NOTSUP_MASK \\\ndiff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c\nindex 522e9a0d34..53d01612d1 100644\n--- a/drivers/net/sfc/sfc_ef100_tx.c\n+++ b/drivers/net/sfc/sfc_ef100_tx.c\n@@ -382,7 +382,7 @@ sfc_ef100_tx_qdesc_send_create(const struct rte_mbuf *m, efx_oword_t *tx_desc)\n \t\t\tESF_GZ_TX_SEND_CSO_OUTER_L4, outer_l4,\n \t\t\tESF_GZ_TX_DESC_TYPE, ESE_GZ_TX_DESC_TYPE_SEND);\n \n-\tif (m->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (m->ol_flags & PKT_TX_VLAN) {\n \t\tefx_oword_t tx_desc_extra_fields;\n \n \t\tEFX_POPULATE_OWORD_2(tx_desc_extra_fields,\n@@ -464,7 +464,7 @@ sfc_ef100_tx_qdesc_tso_create(const struct rte_mbuf *m,\n \n \tEFX_OR_OWORD(*tx_desc, tx_desc_extra_fields);\n \n-\tif (m->ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (m->ol_flags & PKT_TX_VLAN) {\n \t\tEFX_POPULATE_OWORD_2(tx_desc_extra_fields,\n \t\t\t\tESF_GZ_TX_TSO_VLAN_INSERT_EN, 1,\n \t\t\t\tESF_GZ_TX_TSO_VLAN_INSERT_TCI, m->vlan_tci);\ndiff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c\nindex ed43adb4ca..277fe6c6ca 100644\n--- a/drivers/net/sfc/sfc_ef10_tx.c\n+++ b/drivers/net/sfc/sfc_ef10_tx.c\n@@ -805,7 +805,7 @@ sfc_ef10_simple_prepare_pkts(__rte_unused void *tx_queue,\n \n \t\t/* ef10_simple does not support TSO and VLAN insertion */\n \t\tif (unlikely(m->ol_flags &\n-\t\t\t (PKT_TX_TCP_SEG | PKT_TX_VLAN_PKT))) {\n+\t\t\t (PKT_TX_TCP_SEG | PKT_TX_VLAN))) {\n \t\t\trte_errno = ENOTSUP;\n \t\t\tbreak;\n \t\t}\ndiff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c\nindex 49b239f4d2..936ae815ea 100644\n--- a/drivers/net/sfc/sfc_tx.c\n+++ b/drivers/net/sfc/sfc_tx.c\n@@ -766,7 +766,7 @@ static unsigned int\n sfc_efx_tx_maybe_insert_tag(struct sfc_efx_txq *txq, struct rte_mbuf *m,\n \t\t\t efx_desc_t **pend)\n {\n-\tuint16_t this_tag = ((m->ol_flags & PKT_TX_VLAN_PKT) ?\n+\tuint16_t this_tag = ((m->ol_flags & PKT_TX_VLAN) ?\n \t\t\t m->vlan_tci : 0);\n \n \tif (this_tag == txq->hw_vlan_tci)\ndiff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c\nindex b6339fe50b..f8c1ad3937 100644\n--- a/drivers/net/txgbe/txgbe_rxtx.c\n+++ b/drivers/net/txgbe/txgbe_rxtx.c\n@@ -54,7 +54,7 @@ static const u64 TXGBE_TX_OFFLOAD_MASK = (PKT_TX_IP_CKSUM |\n \t\tPKT_TX_OUTER_IPV4 |\n \t\tPKT_TX_IPV6 |\n \t\tPKT_TX_IPV4 |\n-\t\tPKT_TX_VLAN_PKT |\n+\t\tPKT_TX_VLAN |\n \t\tPKT_TX_L4_MASK |\n \t\tPKT_TX_TCP_SEG |\n \t\tPKT_TX_TUNNEL_MASK |\n@@ -408,7 +408,7 @@ txgbe_set_xmit_ctx(struct txgbe_tx_queue *txq,\n \t\tvlan_macip_lens |= TXGBE_TXD_MACLEN(tx_offload.l2_len);\n \t}\n \n-\tif (ol_flags & PKT_TX_VLAN_PKT) {\n+\tif (ol_flags & PKT_TX_VLAN) {\n \t\ttx_offload_mask.vlan_tci |= ~0;\n \t\tvlan_macip_lens |= TXGBE_TXD_VLAN(tx_offload.vlan_tci);\n \t}\n@@ -496,7 +496,7 @@ tx_desc_cksum_flags_to_olinfo(uint64_t ol_flags)\n \t\t\ttmp |= TXGBE_TXD_IPCS;\n \t\ttmp |= TXGBE_TXD_L4CS;\n \t}\n-\tif (ol_flags & PKT_TX_VLAN_PKT)\n+\tif (ol_flags & PKT_TX_VLAN)\n \t\ttmp |= TXGBE_TXD_CC;\n \n \treturn tmp;\n@@ -507,7 +507,7 @@ tx_desc_ol_flags_to_cmdtype(uint64_t ol_flags)\n {\n \tuint32_t cmdtype = 0;\n \n-\tif (ol_flags & PKT_TX_VLAN_PKT)\n+\tif (ol_flags & PKT_TX_VLAN)\n \t\tcmdtype |= TXGBE_TXD_VLE;\n \tif (ol_flags & PKT_TX_TCP_SEG)\n \t\tcmdtype |= TXGBE_TXD_TSE;\ndiff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c\nindex 2e24e5f7ff..2be5edea86 100644\n--- a/drivers/net/vhost/rte_eth_vhost.c\n+++ b/drivers/net/vhost/rte_eth_vhost.c\n@@ -444,7 +444,7 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)\n \t\tstruct rte_mbuf *m = bufs[i];\n \n \t\t/* Do VLAN tag insertion */\n-\t\tif (m->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\tif (m->ol_flags & PKT_TX_VLAN) {\n \t\t\tint error = rte_vlan_insert(&m);\n \t\t\tif (unlikely(error)) {\n \t\t\t\trte_pktmbuf_free(m);\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex e8e6ed20a5..63f70fc13d 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -1744,7 +1744,7 @@ virtio_xmit_pkts_prepare(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts,\n #endif\n \n \t\t/* Do VLAN tag insertion */\n-\t\tif (unlikely(m->ol_flags & PKT_TX_VLAN_PKT)) {\n+\t\tif (unlikely(m->ol_flags & PKT_TX_VLAN)) {\n \t\t\terror = rte_vlan_insert(&m);\n \t\t\t/* rte_vlan_insert() may change pointer\n \t\t\t * even in the case of failure\ndiff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c\nindex b01c4c01f9..0c9f881d8a 100644\n--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c\n+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c\n@@ -49,7 +49,7 @@\n #include \"vmxnet3_ethdev.h\"\n \n #define\tVMXNET3_TX_OFFLOAD_MASK\t( \\\n-\t\tPKT_TX_VLAN_PKT | \\\n+\t\tPKT_TX_VLAN | \\\n \t\tPKT_TX_IPV6 | \\\n \t\tPKT_TX_IPV4 | \\\n \t\tPKT_TX_L4_MASK | \\\n@@ -520,7 +520,7 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \n \t\t/* Add VLAN tag if present */\n \t\tgdesc = txq->cmd_ring.base + first2fill;\n-\t\tif (txm->ol_flags & PKT_TX_VLAN_PKT) {\n+\t\tif (txm->ol_flags & PKT_TX_VLAN) {\n \t\t\tgdesc->txd.ti = 1;\n \t\t\tgdesc->txd.tci = txm->vlan_tci;\n \t\t}\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex b24fd82a6e..d2254733bc 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -1116,7 +1116,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)\n \t\t\t(vh->vlan_tci != vlan_tag_be))\n \t\t\tvh->vlan_tci = vlan_tag_be;\n \t} else {\n-\t\tm->ol_flags |= PKT_TX_VLAN_PKT;\n+\t\tm->ol_flags |= PKT_TX_VLAN;\n \n \t\t/*\n \t\t * Find the right seg to adjust the data len when offset is\ndiff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h\nindex e1e0f4b51b..8e7eef319b 100644\n--- a/lib/mbuf/rte_mbuf_core.h\n+++ b/lib/mbuf/rte_mbuf_core.h\n@@ -265,7 +265,7 @@ extern \"C\" {\n */\n #define PKT_TX_QINQ (1ULL << 49)\n /** This old name is deprecated. */\n-#define PKT_TX_QINQ_PKT PKT_TX_QINQ\n+#define PKT_TX_QINQ_PKT RTE_DEPRECATED(PKT_TX_QINQ_PKT) PKT_TX_QINQ\n \n /**\n * TCP segmentation offload. To enable this offload feature for a\n@@ -334,7 +334,7 @@ extern \"C\" {\n */\n #define PKT_TX_VLAN (1ULL << 57)\n /* this old name is deprecated */\n-#define PKT_TX_VLAN_PKT PKT_TX_VLAN\n+#define PKT_TX_VLAN_PKT RTE_DEPRECATED(PKT_TX_VLAN_PKT) PKT_TX_VLAN\n \n /**\n * Offload the IP checksum of an external header in the hardware. The\n@@ -366,14 +366,14 @@ extern \"C\" {\n \t\tPKT_TX_OUTER_IPV6 |\t \\\n \t\tPKT_TX_OUTER_IPV4 |\t \\\n \t\tPKT_TX_OUTER_IP_CKSUM | \\\n-\t\tPKT_TX_VLAN_PKT | \\\n+\t\tPKT_TX_VLAN | \\\n \t\tPKT_TX_IPV6 |\t\t \\\n \t\tPKT_TX_IPV4 |\t\t \\\n \t\tPKT_TX_IP_CKSUM | \\\n \t\tPKT_TX_L4_MASK | \\\n \t\tPKT_TX_IEEE1588_TMST |\t \\\n \t\tPKT_TX_TCP_SEG | \\\n-\t\tPKT_TX_QINQ_PKT | \\\n+\t\tPKT_TX_QINQ | \\\n \t\tPKT_TX_TUNNEL_MASK |\t \\\n \t\tPKT_TX_MACSEC |\t\t \\\n \t\tPKT_TX_SEC_OFFLOAD |\t \\\n", "prefixes": [ "v2", "2/4" ] }