Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 85587,
    "url": "https://patches.dpdk.org/api/patches/85587/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201221065150.1600719-4-zhirun.yan@intel.com/",
    "project": {
        "id": 1,
        "url": "https://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": "<20201221065150.1600719-4-zhirun.yan@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20201221065150.1600719-4-zhirun.yan@intel.com",
    "date": "2020-12-21T06:51:48",
    "name": "[v1,3/5] net/ice: add outer input set mask to distinguish outer fields",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "68e4e044d7d2df9572ce0cb5c5ed26287ab159ba",
    "submitter": {
        "id": 1154,
        "url": "https://patches.dpdk.org/api/people/1154/?format=api",
        "name": "Yan, Zhirun",
        "email": "zhirun.yan@intel.com"
    },
    "delegate": {
        "id": 1540,
        "url": "https://patches.dpdk.org/api/users/1540/?format=api",
        "username": "qzhan15",
        "first_name": "Qi",
        "last_name": "Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201221065150.1600719-4-zhirun.yan@intel.com/mbox/",
    "series": [
        {
            "id": 14399,
            "url": "https://patches.dpdk.org/api/series/14399/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14399",
            "date": "2020-12-21T06:51:45",
            "name": "Refactor FDIR pattern parser",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/14399/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/85587/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/85587/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 59FD4A09EF;\n\tMon, 21 Dec 2020 07:57:13 +0100 (CET)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F40B6CC40;\n\tMon, 21 Dec 2020 07:56:19 +0100 (CET)",
            "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n by dpdk.org (Postfix) with ESMTP id 01EDACBDC\n for <dev@dpdk.org>; Mon, 21 Dec 2020 07:56:17 +0100 (CET)",
            "from fmsmga001.fm.intel.com ([10.253.24.23])\n by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 20 Dec 2020 22:56:16 -0800",
            "from dpdk-zhirun-dev.sh.intel.com ([10.67.118.176])\n by fmsmga001.fm.intel.com with ESMTP; 20 Dec 2020 22:56:13 -0800"
        ],
        "IronPort-SDR": [
            "\n O4Jlu7sJ6VxYNO+GbENZFUuT05sNNBDg8AUPd1D4hWmF33HaCOm0OOeFO4uEgm1AdYYPZIoXFq\n OrjBsw2zVfJQ==",
            "\n OBqyXqaxmYN55f62QQvb5+ifg/ZQDoc2+7sfpl8ApTUowFtANq4YZUdoT7/QUyMkNZ/1RELYmR\n x4ZM1uS93arw=="
        ],
        "X-IronPort-AV": [
            "E=McAfee;i=\"6000,8403,9841\"; a=\"237252411\"",
            "E=Sophos;i=\"5.78,436,1599548400\"; d=\"scan'208\";a=\"237252411\"",
            "E=Sophos;i=\"5.78,436,1599548400\"; d=\"scan'208\";a=\"456007061\""
        ],
        "X-ExtLoop1": "1",
        "From": "Zhirun Yan <zhirun.yan@intel.com>",
        "To": "dev@dpdk.org, qi.z.zhang@intel.com, yahui.cao@intel.com,\n xiao.w.wang@intel.com, junfeng.guo@intel.com",
        "Cc": "simei.su@intel.com, ting.xu@intel.com, yuying.zhang@intel.com,\n Zhirun Yan <zhirun.yan@intel.com>",
        "Date": "Mon, 21 Dec 2020 14:51:48 +0800",
        "Message-Id": "<20201221065150.1600719-4-zhirun.yan@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20201221065150.1600719-1-zhirun.yan@intel.com>",
        "References": "<20201221065150.1600719-1-zhirun.yan@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v1 3/5] net/ice: add outer input set mask to\n\tdistinguish outer fields",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "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": "Add 64-bit input_set_mask_f for outer input set. input_set_mask_f is\nused for inner fields or non-tunnel fields. Adjust indentation of\nice_pattern_match_item list in switch, RSS and FDIR for easy\nreview. For fields in tunnel layer, like GTPU TEID, put them in\nouter part.\n\nSigned-off-by: Zhirun Yan <zhirun.yan@intel.com>\n---\n drivers/net/ice/ice_fdir_filter.c   | 110 ++++-----\n drivers/net/ice/ice_generic_flow.h  |   1 +\n drivers/net/ice/ice_hash.c          | 192 ++++++---------\n drivers/net/ice/ice_switch_filter.c | 348 ++++++++++------------------\n 4 files changed, 231 insertions(+), 420 deletions(-)",
    "diff": "diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c\nindex 1f2576a444..76e0a8df38 100644\n--- a/drivers/net/ice/ice_fdir_filter.c\n+++ b/drivers/net/ice/ice_fdir_filter.c\n@@ -55,92 +55,74 @@\n \tICE_FDIR_INSET_ETH_IPV6 | \\\n \tICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT)\n \n-#define ICE_FDIR_INSET_VXLAN_IPV4 (\\\n+#define ICE_FDIR_INSET_VXLAN_IPV4_L (\\\n \tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST)\n \n-#define ICE_FDIR_INSET_VXLAN_IPV4_TCP (\\\n-\tICE_FDIR_INSET_VXLAN_IPV4 | \\\n+#define ICE_FDIR_INSET_VXLAN_IPV4_TCP_L (\\\n+\tICE_FDIR_INSET_VXLAN_IPV4_L | \\\n \tICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT)\n \n-#define ICE_FDIR_INSET_VXLAN_IPV4_UDP (\\\n-\tICE_FDIR_INSET_VXLAN_IPV4 | \\\n+#define ICE_FDIR_INSET_VXLAN_IPV4_UDP_L (\\\n+\tICE_FDIR_INSET_VXLAN_IPV4_L | \\\n \tICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT)\n \n-#define ICE_FDIR_INSET_VXLAN_IPV4_SCTP (\\\n-\tICE_FDIR_INSET_VXLAN_IPV4 | \\\n+#define ICE_FDIR_INSET_VXLAN_IPV4_SCTP_L (\\\n+\tICE_FDIR_INSET_VXLAN_IPV4_L | \\\n \tICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT)\n \n-#define ICE_FDIR_INSET_IPV4_GTPU (\\\n+#define ICE_FDIR_INSET_IPV4_GTPU_F (\\\n \tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)\n \n-#define ICE_FDIR_INSET_IPV4_GTPU_EH (\\\n+#define ICE_FDIR_INSET_IPV4_GTPU_EH_F (\\\n \tICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \\\n \tICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)\n \n-#define ICE_FDIR_INSET_IPV6_GTPU (\\\n+#define ICE_FDIR_INSET_IPV6_GTPU_F (\\\n \tICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | ICE_INSET_GTPU_TEID)\n \n-#define ICE_FDIR_INSET_IPV6_GTPU_EH (\\\n+#define ICE_FDIR_INSET_IPV6_GTPU_EH_F (\\\n \tICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | \\\n \tICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)\n \n static struct ice_pattern_match_item ice_fdir_pattern_os[] = {\n-\t{pattern_eth_ipv4,             ICE_FDIR_INSET_ETH_IPV4,              ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp,         ICE_FDIR_INSET_ETH_IPV4_UDP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_tcp,         ICE_FDIR_INSET_ETH_IPV4_TCP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_sctp,        ICE_FDIR_INSET_ETH_IPV4_SCTP,         ICE_INSET_NONE},\n-\t{pattern_eth_ipv6,             ICE_FDIR_INSET_ETH_IPV6,              ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp,         ICE_FDIR_INSET_ETH_IPV6_UDP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_tcp,         ICE_FDIR_INSET_ETH_IPV6_TCP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_sctp,        ICE_FDIR_INSET_ETH_IPV6_SCTP,         ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4_udp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},\n+\t{pattern_eth_ipv4,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_tcp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_sctp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4_SCTP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV6,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV6_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_tcp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV6_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_sctp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV6_SCTP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_L,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4_udp,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_UDP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_TCP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_L,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_UDP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_TCP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,\tICE_INSET_NONE},\n };\n \n static struct ice_pattern_match_item ice_fdir_pattern_comms[] = {\n-\t{pattern_ethertype,\t       ICE_FDIR_INSET_ETH,\t\t     ICE_INSET_NONE},\n-\t{pattern_eth_ipv4,             ICE_FDIR_INSET_ETH_IPV4,              ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp,         ICE_FDIR_INSET_ETH_IPV4_UDP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_tcp,         ICE_FDIR_INSET_ETH_IPV4_TCP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_sctp,        ICE_FDIR_INSET_ETH_IPV4_SCTP,         ICE_INSET_NONE},\n-\t{pattern_eth_ipv6,             ICE_FDIR_INSET_ETH_IPV6,              ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp,         ICE_FDIR_INSET_ETH_IPV6_UDP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_tcp,         ICE_FDIR_INSET_ETH_IPV6_TCP,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_sctp,        ICE_FDIR_INSET_ETH_IPV6_SCTP,         ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4_udp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4,            ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_UDP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_TCP,        ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,\n-\t\t\t\t       ICE_FDIR_INSET_VXLAN_IPV4_SCTP,       ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_gtpu,\t       ICE_FDIR_INSET_IPV4_GTPU,             ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_gtpu_eh,     ICE_FDIR_INSET_IPV4_GTPU_EH,          ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_gtpu,\t       ICE_FDIR_INSET_IPV6_GTPU,             ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_gtpu_eh,     ICE_FDIR_INSET_IPV6_GTPU_EH,          ICE_INSET_NONE},\n+\t{pattern_ethertype,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_tcp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_sctp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV4_SCTP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV6,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp,\t\t\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_ETH_IPV6_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_L,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4_udp,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_UDP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4_tcp,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_TCP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_ipv4_sctp,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\t\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_L,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_UDP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_TCP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp,\tICE_INSET_NONE,\t\t\tICE_FDIR_INSET_VXLAN_IPV4_SCTP_L,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_gtpu,\t\t\t\tICE_FDIR_INSET_IPV4_GTPU_F,\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_gtpu_eh,\t\t\tICE_FDIR_INSET_IPV4_GTPU_EH_F,\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_gtpu,\t\t\t\tICE_FDIR_INSET_IPV6_GTPU_F,\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_gtpu_eh,\t\t\tICE_FDIR_INSET_IPV6_GTPU_EH_F,\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n };\n \n static struct ice_flow_parser ice_fdir_parser_os;\ndiff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h\nindex a03b2fc21d..f15c262625 100644\n--- a/drivers/net/ice/ice_generic_flow.h\n+++ b/drivers/net/ice/ice_generic_flow.h\n@@ -473,6 +473,7 @@ enum ice_flow_classification_stage {\n struct ice_pattern_match_item {\n \tenum rte_flow_item_type *pattern_list;\n \t/* pattern_list must end with RTE_FLOW_ITEM_TYPE_END */\n+\tuint64_t input_set_mask_f;\n \tuint64_t input_set_mask;\n \tvoid *meta;\n };\ndiff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c\nindex fe3e06c579..72558161bf 100644\n--- a/drivers/net/ice/ice_hash.c\n+++ b/drivers/net/ice/ice_hash.c\n@@ -315,135 +315,77 @@ struct rss_type_match_hdr hint_eth_pppoes = {\n \n /* Supported pattern for os default package. */\n static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {\n-\t{pattern_eth_ipv4,\tICE_INSET_NONE,\t&hint_eth_ipv4},\n-\t{pattern_eth_ipv4_udp,\tICE_INSET_NONE,\t&hint_eth_ipv4_udp},\n-\t{pattern_eth_ipv4_tcp,\tICE_INSET_NONE,\t&hint_eth_ipv4_tcp},\n-\t{pattern_eth_ipv4_sctp,\tICE_INSET_NONE,\t&hint_eth_ipv4_sctp},\n-\t{pattern_eth_ipv6,\tICE_INSET_NONE,\t&hint_eth_ipv6},\n-\t{pattern_eth_ipv6_udp,\tICE_INSET_NONE,\t&hint_eth_ipv6_udp},\n-\t{pattern_eth_ipv6_tcp,\tICE_INSET_NONE,\t&hint_eth_ipv6_tcp},\n-\t{pattern_eth_ipv6_sctp,\tICE_INSET_NONE,\t&hint_eth_ipv6_sctp},\n-\t{pattern_empty,\t\tICE_INSET_NONE,\t&hint_empty},\n+\t{pattern_eth_ipv4,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4},\n+\t{pattern_eth_ipv4_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_udp},\n+\t{pattern_eth_ipv4_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_tcp},\n+\t{pattern_eth_ipv4_sctp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_sctp},\n+\t{pattern_eth_ipv6,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6},\n+\t{pattern_eth_ipv6_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_udp},\n+\t{pattern_eth_ipv6_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_tcp},\n+\t{pattern_eth_ipv6_sctp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_sctp},\n+\t{pattern_empty,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_empty},\n };\n \n /* Supported pattern for comms package. */\n static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {\n-\t{pattern_empty,\t\t\t    ICE_INSET_NONE,\n-\t\t&hint_empty},\n-\t{pattern_eth_ipv4,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4},\n-\t{pattern_eth_ipv4_udp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_udp},\n-\t{pattern_eth_ipv4_tcp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_tcp},\n-\t{pattern_eth_ipv4_sctp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_sctp},\n-\t{pattern_eth_ipv4_gtpu_ipv4,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_ipv4},\n-\t{pattern_eth_ipv4_gtpu_ipv4_udp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_ipv4_udp},\n-\t{pattern_eth_ipv4_gtpu_ipv4_tcp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_ipv4_tcp},\n-\t{pattern_eth_ipv4_gtpu_ipv6,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_ipv6},\n-\t{pattern_eth_ipv4_gtpu_ipv6_udp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_ipv6_udp},\n-\t{pattern_eth_ipv4_gtpu_ipv6_tcp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_ipv6_tcp},\n-\t{pattern_eth_ipv6_gtpu_ipv4,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_ipv4},\n-\t{pattern_eth_ipv6_gtpu_ipv4_udp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_ipv4_udp},\n-\t{pattern_eth_ipv6_gtpu_ipv4_tcp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_ipv4_tcp},\n-\t{pattern_eth_ipv6_gtpu_ipv6,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_ipv6},\n-\t{pattern_eth_ipv6_gtpu_ipv6_udp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_ipv6_udp},\n-\t{pattern_eth_ipv6_gtpu_ipv6_tcp,    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_ipv6_tcp},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv4,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_eh_ipv4},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_eh_ipv4_udp},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_eh_ipv4_tcp},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv6,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_eh_ipv6},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_eh_ipv6_udp},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_gtpu_eh_ipv6_tcp},\n-\t{pattern_eth_ipv6_gtpu_eh_ipv4,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_eh_ipv4},\n-\t{pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_eh_ipv4_udp},\n-\t{pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_eh_ipv4_tcp},\n-\t{pattern_eth_ipv6_gtpu_eh_ipv6,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_eh_ipv6},\n-\t{pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_eh_ipv6_udp},\n-\t{pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_gtpu_eh_ipv6_tcp},\n-\t{pattern_eth_pppoes_ipv4,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes_ipv4},\n-\t{pattern_eth_pppoes_ipv4_udp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes_ipv4_udp},\n-\t{pattern_eth_pppoes_ipv4_tcp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes_ipv4_tcp},\n-\t{pattern_eth_ipv4_esp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_esp},\n-\t{pattern_eth_ipv4_udp_esp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_udp_esp},\n-\t{pattern_eth_ipv4_ah,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_ah},\n-\t{pattern_eth_ipv4_l2tp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_l2tpv3},\n-\t{pattern_eth_ipv4_pfcp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv4_pfcp},\n-\t{pattern_eth_vlan_ipv4,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv4},\n-\t{pattern_eth_vlan_ipv4_udp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv4_udp},\n-\t{pattern_eth_vlan_ipv4_tcp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv4_tcp},\n-\t{pattern_eth_vlan_ipv4_sctp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv4_sctp},\n-\t{pattern_eth_ipv6,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6},\n-\t{pattern_eth_ipv6_udp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_udp},\n-\t{pattern_eth_ipv6_tcp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_tcp},\n-\t{pattern_eth_ipv6_sctp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_sctp},\n-\t{pattern_eth_ipv6_esp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_esp},\n-\t{pattern_eth_ipv6_udp_esp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_udp_esp},\n-\t{pattern_eth_ipv6_ah,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_ah},\n-\t{pattern_eth_ipv6_l2tp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_l2tpv3},\n-\t{pattern_eth_ipv6_pfcp,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_ipv6_pfcp},\n-\t{pattern_eth_vlan_ipv6,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv6},\n-\t{pattern_eth_vlan_ipv6_udp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv6_udp},\n-\t{pattern_eth_vlan_ipv6_tcp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv6_tcp},\n-\t{pattern_eth_vlan_ipv6_sctp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_vlan_ipv6_sctp},\n-\t{pattern_eth_pppoes_ipv6,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes_ipv6},\n-\t{pattern_eth_pppoes_ipv6_udp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes_ipv6_udp},\n-\t{pattern_eth_pppoes_ipv6_tcp,\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes_ipv6_tcp},\n-\t{pattern_eth_pppoes,\t\t    ICE_INSET_NONE,\n-\t\t&hint_eth_pppoes},\n+\t{pattern_empty,\t\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_empty},\n+\t{pattern_eth_ipv4,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4},\n+\t{pattern_eth_ipv4_udp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_udp},\n+\t{pattern_eth_ipv4_tcp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_tcp},\n+\t{pattern_eth_ipv4_sctp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_sctp},\n+\t{pattern_eth_ipv4_gtpu_ipv4,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_ipv4},\n+\t{pattern_eth_ipv4_gtpu_ipv4_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_ipv4_udp},\n+\t{pattern_eth_ipv4_gtpu_ipv4_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_ipv4_tcp},\n+\t{pattern_eth_ipv4_gtpu_ipv6,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_ipv6},\n+\t{pattern_eth_ipv4_gtpu_ipv6_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_ipv6_udp},\n+\t{pattern_eth_ipv4_gtpu_ipv6_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_ipv6_tcp},\n+\t{pattern_eth_ipv6_gtpu_ipv4,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_ipv4},\n+\t{pattern_eth_ipv6_gtpu_ipv4_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_ipv4_udp},\n+\t{pattern_eth_ipv6_gtpu_ipv4_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_ipv4_tcp},\n+\t{pattern_eth_ipv6_gtpu_ipv6,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_ipv6},\n+\t{pattern_eth_ipv6_gtpu_ipv6_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_ipv6_udp},\n+\t{pattern_eth_ipv6_gtpu_ipv6_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_ipv6_tcp},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv4,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_eh_ipv4},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv4_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_eh_ipv4_udp},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv4_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_eh_ipv4_tcp},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv6,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_eh_ipv6},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv6_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_eh_ipv6_udp},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv6_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_gtpu_eh_ipv6_tcp},\n+\t{pattern_eth_ipv6_gtpu_eh_ipv4,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_eh_ipv4},\n+\t{pattern_eth_ipv6_gtpu_eh_ipv4_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_eh_ipv4_udp},\n+\t{pattern_eth_ipv6_gtpu_eh_ipv4_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_eh_ipv4_tcp},\n+\t{pattern_eth_ipv6_gtpu_eh_ipv6,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_eh_ipv6},\n+\t{pattern_eth_ipv6_gtpu_eh_ipv6_udp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_eh_ipv6_udp},\n+\t{pattern_eth_ipv6_gtpu_eh_ipv6_tcp,\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_gtpu_eh_ipv6_tcp},\n+\t{pattern_eth_pppoes_ipv4,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes_ipv4},\n+\t{pattern_eth_pppoes_ipv4_udp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes_ipv4_udp},\n+\t{pattern_eth_pppoes_ipv4_tcp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes_ipv4_tcp},\n+\t{pattern_eth_ipv4_esp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_esp},\n+\t{pattern_eth_ipv4_udp_esp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_udp_esp},\n+\t{pattern_eth_ipv4_ah,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_ah},\n+\t{pattern_eth_ipv4_l2tp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_l2tpv3},\n+\t{pattern_eth_ipv4_pfcp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv4_pfcp},\n+\t{pattern_eth_vlan_ipv4,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv4},\n+\t{pattern_eth_vlan_ipv4_udp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv4_udp},\n+\t{pattern_eth_vlan_ipv4_tcp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv4_tcp},\n+\t{pattern_eth_vlan_ipv4_sctp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv4_sctp},\n+\t{pattern_eth_ipv6,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6},\n+\t{pattern_eth_ipv6_udp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_udp},\n+\t{pattern_eth_ipv6_tcp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_tcp},\n+\t{pattern_eth_ipv6_sctp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_sctp},\n+\t{pattern_eth_ipv6_esp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_esp},\n+\t{pattern_eth_ipv6_udp_esp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_udp_esp},\n+\t{pattern_eth_ipv6_ah,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_ah},\n+\t{pattern_eth_ipv6_l2tp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_l2tpv3},\n+\t{pattern_eth_ipv6_pfcp,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_ipv6_pfcp},\n+\t{pattern_eth_vlan_ipv6,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv6},\n+\t{pattern_eth_vlan_ipv6_udp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv6_udp},\n+\t{pattern_eth_vlan_ipv6_tcp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv6_tcp},\n+\t{pattern_eth_vlan_ipv6_sctp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_vlan_ipv6_sctp},\n+\t{pattern_eth_pppoes_ipv6,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes_ipv6},\n+\t{pattern_eth_pppoes_ipv6_udp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes_ipv6_udp},\n+\t{pattern_eth_pppoes_ipv6_tcp,\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes_ipv6_tcp},\n+\t{pattern_eth_pppoes,\t\t\tICE_INSET_NONE,\tICE_INSET_NONE,\t&hint_eth_pppoes},\n };\n \n /**\ndiff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c\nindex 8cba6eb7b1..48e1c69756 100644\n--- a/drivers/net/ice/ice_switch_filter.c\n+++ b/drivers/net/ice/ice_switch_filter.c\n@@ -35,8 +35,8 @@\n #define ICE_SW_INSET_ETHER ( \\\n \tICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)\n #define ICE_SW_INSET_MAC_VLAN ( \\\n-\t\tICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \\\n-\t\tICE_INSET_VLAN_OUTER)\n+\tICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \\\n+\tICE_INSET_VLAN_OUTER)\n #define ICE_SW_INSET_MAC_IPV4 ( \\\n \tICE_INSET_DMAC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_SRC | \\\n \tICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS)\n@@ -93,7 +93,7 @@\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-#define ICE_SW_INSET_MAC_PPPOE  ( \\\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 #define ICE_SW_INSET_MAC_PPPOE_PROTO  ( \\\n@@ -144,246 +144,132 @@ static struct ice_flow_parser ice_switch_perm_parser_comms;\n \n static struct\n ice_pattern_match_item ice_switch_pattern_dist_os[] = {\n-\t{pattern_ethertype,\n-\t\t\tICE_SW_INSET_ETHER, ICE_INSET_NONE},\n-\t{pattern_ethertype_vlan,\n-\t\t\tICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},\n-\t{pattern_eth_arp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4,\n-\t\t\tICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6,\n-\t\t\tICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\n-\t\t\tICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4,\n-\t\t\tICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},\n+\t{pattern_ethertype,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_ETHER,\t\t\tICE_INSET_NONE},\n+\t{pattern_ethertype_vlan,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_VLAN,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_arp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_VXLAN_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_VXLAN_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_VXLAN_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_NVGRE_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_NVGRE_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_NVGRE_IPV4_TCP,\tICE_INSET_NONE},\n };\n \n static struct\n ice_pattern_match_item ice_switch_pattern_dist_comms[] = {\n-\t{pattern_ethertype,\n-\t\t\tICE_SW_INSET_ETHER, ICE_INSET_NONE},\n-\t{pattern_ethertype_vlan,\n-\t\t\tICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},\n-\t{pattern_eth_arp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4,\n-\t\t\tICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6,\n-\t\t\tICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\n-\t\t\tICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4,\n-\t\t\tICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_proto,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_proto,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv4,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv6,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv4,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv6,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_ah,\n-\t\t\tICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_ah,\n-\t\t\tICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp_ah,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_l2tp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_l2tp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_pfcp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_pfcp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n+\t{pattern_ethertype,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_ETHER,\t\t\tICE_INSET_NONE},\n+\t{pattern_ethertype_vlan,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_VLAN,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_arp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_VXLAN_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_VXLAN_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_VXLAN_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_NVGRE_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_NVGRE_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_DIST_NVGRE_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_proto,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_PROTO,\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_proto,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_PROTO,\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_tcp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_udp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6,\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_tcp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_udp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6,\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_esp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_esp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_esp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp_esp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_ah,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_AH,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_ah,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_AH,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp_ah,\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_l2tp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_L2TP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_l2tp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_L2TP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_pfcp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_pfcp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n };\n \n static struct\n ice_pattern_match_item ice_switch_pattern_perm_os[] = {\n-\t{pattern_ethertype,\n-\t\t\tICE_SW_INSET_ETHER, ICE_INSET_NONE},\n-\t{pattern_ethertype_vlan,\n-\t\t\tICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},\n-\t{pattern_eth_arp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4,\n-\t\t\tICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6,\n-\t\t\tICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},\n+\t{pattern_ethertype,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_ETHER,\t\t\tICE_INSET_NONE},\n+\t{pattern_ethertype_vlan,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_VLAN,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_arp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,\tICE_INSET_NONE},\n };\n \n static struct\n ice_pattern_match_item ice_switch_pattern_perm_comms[] = {\n-\t{pattern_ethertype,\n-\t\t\tICE_SW_INSET_ETHER, ICE_INSET_NONE},\n-\t{pattern_ethertype_vlan,\n-\t\t\tICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},\n-\t{pattern_eth_arp,\n-\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4,\n-\t\t\tICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6,\n-\t\t\tICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\n-\t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_proto,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_proto,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv4,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv6,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoes_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv4,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv4_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv4_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv6,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv6_tcp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoes_ipv6_udp,\n-\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_udp_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp_esp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_ah,\n-\t\t\tICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_ah,\n-\t\t\tICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_udp_ah,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_l2tp,\n-\t\t\tICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_l2tp,\n-\t\t\tICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},\n-\t{pattern_eth_ipv4_pfcp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n-\t{pattern_eth_ipv6_pfcp,\n-\t\t\tICE_INSET_NONE, ICE_INSET_NONE},\n+\t{pattern_ethertype,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_ETHER,\t\t\tICE_INSET_NONE},\n+\t{pattern_ethertype_vlan,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_VLAN,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_arp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_UDP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_tcp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_TCP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE,\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_proto,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_PROTO,\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_proto,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_PROTO,\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_tcp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_udp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6,\t\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_tcp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_udp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4,\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6,\t\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_tcp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP,\tICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_udp,\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP,\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_esp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_udp_esp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_esp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp_esp,\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_ESP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_ah,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_AH,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_ah,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_AH,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_udp_ah,\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_l2tp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV4_L2TP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_l2tp,\t\t\t\tICE_INSET_NONE,\t\tICE_SW_INSET_MAC_IPV6_L2TP,\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv4_pfcp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n+\t{pattern_eth_ipv6_pfcp,\t\t\t\tICE_INSET_NONE,\t\tICE_INSET_NONE,\t\t\t\tICE_INSET_NONE},\n };\n \n static int\n",
    "prefixes": [
        "v1",
        "3/5"
    ]
}