Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/92145/?format=api
{ "id": 92145, "url": "http://patches.dpdk.org/api/patches/92145/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210426053814.984788-1-yuying.zhang@intel.com/", "project": { "id": 1, "url": "http://patches.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": "<20210426053814.984788-1-yuying.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210426053814.984788-1-yuying.zhang@intel.com", "date": "2021-04-26T05:38:13", "name": "[v4,1/2] net/ice: clean redundant macro definition of filters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "194a751f98839d151270ab3b12f3020d59ba988d", "submitter": { "id": 1844, "url": "http://patches.dpdk.org/api/people/1844/?format=api", "name": "Zhang, Yuying", "email": "yuying.zhang@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210426053814.984788-1-yuying.zhang@intel.com/mbox/", "series": [ { "id": 16664, "url": "http://patches.dpdk.org/api/series/16664/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=16664", "date": "2021-04-26T05:38:13", "name": "[v4,1/2] net/ice: clean redundant macro definition of filters", "version": 4, "mbox": "http://patches.dpdk.org/series/16664/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/92145/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/92145/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 A7D7BA0548;\n\tMon, 26 Apr 2021 07:49:38 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6D34B410D8;\n\tMon, 26 Apr 2021 07:49:38 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by mails.dpdk.org (Postfix) with ESMTP id 842F140A4B\n for <dev@dpdk.org>; Mon, 26 Apr 2021 07:49:36 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 25 Apr 2021 22:49:35 -0700", "from dpdk-yyzhang2.sh.intel.com ([10.67.117.129])\n by fmsmga002.fm.intel.com with ESMTP; 25 Apr 2021 22:49:33 -0700" ], "IronPort-SDR": [ "\n DhHCtMDiHYljZ9bw8nkf3ENctc+/VAOjHe/1X1YyYDoC2dd6SxbDlrwyJYQFfnM4nmcsyqiGpK\n BqxSnBe++e7g==", "\n x9YYx7mEISKnBAdlapI7pDpe39KRutxfhIdyuVptkZF7v93PIiXUdDwt+aZjizUs2F1kLy6c/+\n +ogG1Br8ythg==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,9965\"; a=\"281613810\"", "E=Sophos;i=\"5.82,251,1613462400\"; d=\"scan'208\";a=\"281613810\"", "E=Sophos;i=\"5.82,251,1613462400\"; d=\"scan'208\";a=\"457015771\"" ], "X-ExtLoop1": "1", "From": "Yuying Zhang <yuying.zhang@intel.com>", "To": "dev@dpdk.org,\n\tqi.z.zhang@intel.com,\n\thaiyue.wang@intel.com", "Cc": "zhirun.yan@intel.com, junfeng.guo@intel.com,\n Yuying Zhang <yuying.zhang@intel.com>", "Date": "Mon, 26 Apr 2021 05:38:13 +0000", "Message-Id": "<20210426053814.984788-1-yuying.zhang@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210422100541.935478-1-yuying.zhang@intel.com>", "References": "<20210422100541.935478-1-yuying.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 1/2] net/ice: clean redundant macro definition\n of filters", "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 input set has been divided into two parts to distinguish\ninner and outer field. ICE_INSET_TUN_* is the same as non tunnel\nmacro definition. Clean redundant ICE_INSET_TUN_* codes.\n\nSigned-off-by: Yuying Zhang <yuying.zhang@intel.com>\n---\n drivers/net/ice/ice_fdir_filter.c | 22 ++---\n drivers/net/ice/ice_generic_flow.h | 61 +------------\n drivers/net/ice/ice_switch_filter.c | 128 ++++++++++++++--------------\n 3 files changed, 78 insertions(+), 133 deletions(-)", "diff": "diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c\nindex 3b8ea32b1a..ad2dc40815 100644\n--- a/drivers/net/ice/ice_fdir_filter.c\n+++ b/drivers/net/ice/ice_fdir_filter.c\n@@ -72,7 +72,7 @@\n \n #define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\\\n \tICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \\\n-\tICE_INSET_TUN_VXLAN_VNI)\n+\tICE_INSET_VXLAN_VNI)\n \n #define ICE_FDIR_INSET_IPV4_GTPU (\\\n \tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)\n@@ -893,17 +893,17 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field)\n \t\t{ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},\n \t\t{ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},\n \t\t{ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},\n-\t\t{ICE_INSET_TUN_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},\n-\t\t{ICE_INSET_TUN_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},\n-\t\t{ICE_INSET_TUN_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},\n-\t\t{ICE_INSET_TUN_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},\n-\t\t{ICE_INSET_TUN_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},\n-\t\t{ICE_INSET_TUN_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},\n-\t\t{ICE_INSET_TUN_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},\n-\t\t{ICE_INSET_TUN_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},\n+\t\t{ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},\n+\t\t{ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},\n+\t\t{ICE_INSET_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},\n+\t\t{ICE_INSET_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},\n+\t\t{ICE_INSET_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},\n+\t\t{ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},\n+\t\t{ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},\n+\t\t{ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},\n \t\t{ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID},\n \t\t{ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI},\n-\t\t{ICE_INSET_TUN_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},\n+\t\t{ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},\n \t};\n \n \tfor (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) {\n@@ -1916,7 +1916,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,\n \t\t\t}\n \n \t\t\tif (vxlan_mask->hdr.vx_vni)\n-\t\t\t\t*input_set |= ICE_INSET_TUN_VXLAN_VNI;\n+\t\t\t\t*input_set |= ICE_INSET_VXLAN_VNI;\n \n \t\t\tfilter->input.vxlan_data.vni = vxlan_spec->hdr.vx_vni;\n \ndiff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h\nindex a4d0b6671d..b7634b9662 100644\n--- a/drivers/net/ice/ice_generic_flow.h\n+++ b/drivers/net/ice/ice_generic_flow.h\n@@ -92,64 +92,9 @@\n \n /* tunnel */\n \n-#define ICE_INSET_TUN_SMAC \\\n-\t(ICE_PROT_MAC | ICE_SMAC)\n-#define ICE_INSET_TUN_DMAC \\\n-\t(ICE_PROT_MAC | ICE_DMAC)\n-\n-#define ICE_INSET_TUN_IPV4_SRC \\\n-\t(ICE_PROT_IPV4 | ICE_IP_SRC)\n-#define ICE_INSET_TUN_IPV4_DST \\\n-\t(ICE_PROT_IPV4 | ICE_IP_DST)\n-#define ICE_INSET_TUN_IPV4_TTL \\\n-\t(ICE_PROT_IPV4 | ICE_IP_TTL)\n-#define ICE_INSET_TUN_IPV4_PROTO \\\n-\t(ICE_PROT_IPV4 | ICE_IP_PROTO)\n-#define ICE_INSET_TUN_IPV4_TOS \\\n-\t(ICE_PROT_IPV4 | ICE_IP_TOS)\n-#define ICE_INSET_TUN_IPV6_SRC \\\n-\t(ICE_PROT_IPV6 | ICE_IP_SRC)\n-#define ICE_INSET_TUN_IPV6_DST \\\n-\t(ICE_PROT_IPV6 | ICE_IP_DST)\n-#define ICE_INSET_TUN_IPV6_HOP_LIMIT \\\n-\t(ICE_PROT_IPV6 | ICE_IP_TTL)\n-#define ICE_INSET_TUN_IPV6_NEXT_HDR \\\n-\t(ICE_PROT_IPV6 | ICE_IP_PROTO)\n-#define ICE_INSET_TUN_IPV6_TC \\\n-\t(ICE_PROT_IPV6 | ICE_IP_TOS)\n-\n-#define ICE_INSET_TUN_TCP_SRC_PORT \\\n-\t(ICE_PROT_TCP | ICE_SPORT)\n-#define ICE_INSET_TUN_TCP_DST_PORT \\\n-\t(ICE_PROT_TCP | ICE_DPORT)\n-#define ICE_INSET_TUN_UDP_SRC_PORT \\\n-\t(ICE_PROT_UDP | ICE_SPORT)\n-#define ICE_INSET_TUN_UDP_DST_PORT \\\n-\t(ICE_PROT_UDP | ICE_DPORT)\n-#define ICE_INSET_TUN_SCTP_SRC_PORT \\\n-\t(ICE_PROT_SCTP | ICE_SPORT)\n-#define ICE_INSET_TUN_SCTP_DST_PORT \\\n-\t(ICE_PROT_SCTP | ICE_DPORT)\n-#define ICE_INSET_TUN_ICMP4_SRC_PORT \\\n-\t(ICE_PROT_ICMP4 | ICE_SPORT)\n-#define ICE_INSET_TUN_ICMP4_DST_PORT \\\n-\t(ICE_PROT_ICMP4 | ICE_DPORT)\n-#define ICE_INSET_TUN_ICMP6_SRC_PORT \\\n-\t(ICE_PROT_ICMP6 | ICE_SPORT)\n-#define ICE_INSET_TUN_ICMP6_DST_PORT \\\n-\t(ICE_PROT_ICMP6 | ICE_DPORT)\n-#define ICE_INSET_TUN_ICMP4_TYPE \\\n-\t(ICE_PROT_ICMP4 | ICE_ICMP_TYPE)\n-#define ICE_INSET_TUN_ICMP4_CODE \\\n-\t(ICE_PROT_ICMP4 | ICE_ICMP_CODE)\n-#define ICE_INSET_TUN_ICMP6_TYPE \\\n-\t(ICE_PROT_ICMP6 | ICE_ICMP_TYPE)\n-#define ICE_INSET_TUN_ICMP6_CODE \\\n-\t(ICE_PROT_ICMP6 | ICE_ICMP_CODE)\n-\n-#define ICE_INSET_TUN_VXLAN_VNI \\\n+#define ICE_INSET_VXLAN_VNI \\\n \t(ICE_PROT_VXLAN | ICE_VXLAN_VNI)\n-#define ICE_INSET_TUN_NVGRE_TNI \\\n+#define ICE_INSET_NVGRE_TNI \\\n \t(ICE_PROT_NVGRE | ICE_NVGRE_TNI)\n #define ICE_INSET_GTPU_TEID \\\n \t(ICE_PROT_GTPU | ICE_GTPU_TEID)\n@@ -473,8 +418,8 @@ enum ice_flow_classification_stage {\n /* pattern structure */\n struct ice_pattern_match_item {\n \tenum rte_flow_item_type *pattern_list;\n-\tuint64_t input_set_mask_o; /* used for tunnel outer or non tunnel fields */\n \t/* pattern_list must end with RTE_FLOW_ITEM_TYPE_END */\n+\tuint64_t input_set_mask_o; /* used for tunnel outer or non tunnel fields */\n \tuint64_t input_set_mask_i; /* only used for tunnel inner fields */\n \tvoid *meta;\n };\ndiff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c\nindex 0493e4dee2..aa395094ca 100644\n--- a/drivers/net/ice/ice_switch_filter.c\n+++ b/drivers/net/ice/ice_switch_filter.c\n@@ -68,38 +68,38 @@\n \tICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \\\n \tICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT)\n #define ICE_SW_INSET_DIST_NVGRE_IPV4 ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \\\n-\tICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \\\n+\tICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \\\n-\tICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \\\n+\tICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \\\n-\tICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \\\n+\tICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \\\n-\tICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \\\n+\tICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_IPV4_PROTO | ICE_INSET_TUN_IPV4_TOS)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TOS)\n #define ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \\\n-\tICE_INSET_TUN_IPV4_TOS)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \\\n+\tICE_INSET_IPV4_TOS)\n #define ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP ( \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \\\n-\tICE_INSET_TUN_IPV4_TOS)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \\\n+\tICE_INSET_IPV4_TOS)\n #define ICE_SW_INSET_MAC_PPPOE ( \\\n \tICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \\\n \tICE_INSET_DMAC | ICE_INSET_ETHERTYPE | ICE_INSET_PPPOE_SESSION)\n@@ -143,72 +143,72 @@\n \tICE_SW_INSET_MAC_IPV6 | ICE_INSET_GTPU_TEID)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 ( \\\n \tICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | ICE_INSET_GTPU_QFI)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 ( \\\n \tICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \\\n-\tICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST)\n+\tICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | ICE_INSET_GTPU_QFI)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 ( \\\n \tICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \\\n-\tICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST)\n+\tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | ICE_INSET_GTPU_QFI)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 ( \\\n \tICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \\\n-\tICE_INSET_TUN_IPV6_SRC | ICE_INSET_TUN_IPV6_DST)\n+\tICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | ICE_INSET_GTPU_QFI)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_UDP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_UDP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_TCP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_TCP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_UDP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_UDP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6_TCP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6_TCP ( \\\n \tICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_UDP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_UDP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4_TCP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4_TCP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_UDP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_UDP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 | \\\n-\tICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT)\n+\tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6_TCP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n #define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6_TCP ( \\\n \tICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 | \\\n-\tICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT)\n+\tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n \n struct sw_meta {\n \tstruct ice_adv_lkup_elem *list;\n@@ -553,7 +553,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tfor (j = 0; j < RTE_ETHER_ADDR_LEN; j++) {\n \t\t\t\t\tif (a[j] && tunnel_valid) {\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_SMAC;\n+\t\t\t\t\t\t\tICE_INSET_SMAC;\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t} else if (a[j]) {\n \t\t\t\t\t\tinput_set |=\n@@ -564,7 +564,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tfor (j = 0; j < RTE_ETHER_ADDR_LEN; j++) {\n \t\t\t\t\tif (b[j] && tunnel_valid) {\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_DMAC;\n+\t\t\t\t\t\t\tICE_INSET_DMAC;\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t} else if (b[j]) {\n \t\t\t\t\t\tinput_set |=\n@@ -637,19 +637,19 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tif (tunnel_valid) {\n \t\t\t\t\tif (ipv4_mask->hdr.type_of_service)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV4_TOS;\n+\t\t\t\t\t\t\tICE_INSET_IPV4_TOS;\n \t\t\t\t\tif (ipv4_mask->hdr.src_addr)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV4_SRC;\n+\t\t\t\t\t\t\tICE_INSET_IPV4_SRC;\n \t\t\t\t\tif (ipv4_mask->hdr.dst_addr)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV4_DST;\n+\t\t\t\t\t\t\tICE_INSET_IPV4_DST;\n \t\t\t\t\tif (ipv4_mask->hdr.time_to_live)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV4_TTL;\n+\t\t\t\t\t\t\tICE_INSET_IPV4_TTL;\n \t\t\t\t\tif (ipv4_mask->hdr.next_proto_id)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_IPV4_PROTO;\n+\t\t\t\t\t\tICE_INSET_IPV4_PROTO;\n \t\t\t\t} else {\n \t\t\t\t\tif (ipv4_mask->hdr.src_addr)\n \t\t\t\t\t\tinput_set |= ICE_INSET_IPV4_SRC;\n@@ -729,7 +729,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\tif (ipv6_mask->hdr.src_addr[j] &&\n \t\t\t\t\t\ttunnel_valid) {\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_IPV6_SRC;\n+\t\t\t\t\t\tICE_INSET_IPV6_SRC;\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t} else if (ipv6_mask->hdr.src_addr[j]) {\n \t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_SRC;\n@@ -740,7 +740,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\tif (ipv6_mask->hdr.dst_addr[j] &&\n \t\t\t\t\t\ttunnel_valid) {\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_IPV6_DST;\n+\t\t\t\t\t\tICE_INSET_IPV6_DST;\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t} else if (ipv6_mask->hdr.dst_addr[j]) {\n \t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_DST;\n@@ -750,14 +750,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tif (ipv6_mask->hdr.proto &&\n \t\t\t\t\ttunnel_valid)\n \t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_IPV6_NEXT_HDR;\n+\t\t\t\t\t\tICE_INSET_IPV6_NEXT_HDR;\n \t\t\t\telse if (ipv6_mask->hdr.proto)\n \t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_IPV6_NEXT_HDR;\n \t\t\t\tif (ipv6_mask->hdr.hop_limits &&\n \t\t\t\t\ttunnel_valid)\n \t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_IPV6_HOP_LIMIT;\n+\t\t\t\t\t\tICE_INSET_IPV6_HOP_LIMIT;\n \t\t\t\telse if (ipv6_mask->hdr.hop_limits)\n \t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_IPV6_HOP_LIMIT;\n@@ -766,7 +766,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK)) &&\n \t\t\t\t\ttunnel_valid)\n \t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV6_TC;\n+\t\t\t\t\t\t\tICE_INSET_IPV6_TC;\n \t\t\t\telse if (ipv6_mask->hdr.vtc_flow &\n \t\t\t\t\t\trte_cpu_to_be_32\n \t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK))\n@@ -851,10 +851,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tif (tunnel_valid) {\n \t\t\t\t\tif (udp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_UDP_SRC_PORT;\n+\t\t\t\t\t\tICE_INSET_UDP_SRC_PORT;\n \t\t\t\t\tif (udp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_UDP_DST_PORT;\n+\t\t\t\t\t\tICE_INSET_UDP_DST_PORT;\n \t\t\t\t} else {\n \t\t\t\t\tif (udp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n@@ -912,10 +912,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tif (tunnel_valid) {\n \t\t\t\t\tif (tcp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_TCP_SRC_PORT;\n+\t\t\t\t\t\tICE_INSET_TCP_SRC_PORT;\n \t\t\t\t\tif (tcp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_TCP_DST_PORT;\n+\t\t\t\t\t\tICE_INSET_TCP_DST_PORT;\n \t\t\t\t} else {\n \t\t\t\t\tif (tcp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n@@ -959,10 +959,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tif (tunnel_valid) {\n \t\t\t\t\tif (sctp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_SCTP_SRC_PORT;\n+\t\t\t\t\t\tICE_INSET_SCTP_SRC_PORT;\n \t\t\t\t\tif (sctp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_SCTP_DST_PORT;\n+\t\t\t\t\t\tICE_INSET_SCTP_DST_PORT;\n \t\t\t\t} else {\n \t\t\t\t\tif (sctp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n@@ -1021,7 +1021,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\t\t(vxlan_mask->vni[1] << 8) |\n \t\t\t\t\t\tvxlan_mask->vni[0];\n \t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_VXLAN_VNI;\n+\t\t\t\t\t\tICE_INSET_VXLAN_VNI;\n \t\t\t\t\tinput_set_byte += 2;\n \t\t\t\t}\n \t\t\t\tt++;\n@@ -1059,7 +1059,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\t\t(nvgre_mask->tni[1] << 8) |\n \t\t\t\t\t\tnvgre_mask->tni[0];\n \t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_TUN_NVGRE_TNI;\n+\t\t\t\t\t\tICE_INSET_NVGRE_TNI;\n \t\t\t\t\tinput_set_byte += 2;\n \t\t\t\t}\n \t\t\t\tt++;\n", "prefixes": [ "v4", "1/2" ] }