Show a patch.

GET /api/patches/73495/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 73495,
    "url": "https://patches.dpdk.org/api/patches/73495/?format=api",
    "web_url": "https://patches.dpdk.org/patch/73495/",
    "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"
    },
    "msgid": "<20200708032739.156196-3-junfeng.guo@intel.com>",
    "date": "2020-07-08T03:27:39",
    "name": "[v5,2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "e941515d505237a1d53033987ad8a09720871771",
    "submitter": {
        "id": 1785,
        "url": "https://patches.dpdk.org/api/people/1785/?format=api",
        "name": "Junfeng Guo",
        "email": "junfeng.guo@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/patch/73495/mbox/",
    "series": [
        {
            "id": 10872,
            "url": "https://patches.dpdk.org/api/series/10872/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10872",
            "date": "2020-07-08T03:27:37",
            "name": "add RSS support for ipv4 ipv6 mix of GTP on PF and VF",
            "version": 5,
            "mbox": "https://patches.dpdk.org/series/10872/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/73495/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/73495/checks/",
    "tags": {},
    "headers": {
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6000,8403,9675\"; a=\"127332739\"",
            "E=Sophos;i=\"5.75,326,1589266800\"; d=\"scan'208\";a=\"127332739\"",
            "E=Sophos;i=\"5.75,326,1589266800\"; d=\"scan'208\";a=\"357978556\""
        ],
        "IronPort-SDR": [
            "\n fG5coqhVT51iUJmRD6jwFmUDi2O1BPpNNj+52phK5CsnXVKBFjoLSyHnqA8oSSD4VRvgCpTTmt\n mLbnzU0qTZNw==",
            "\n G3Vnqtm6GUKrDAJhTM3Kx3S/puGDLhtHLFsYwyHDPhinCKLfMCnBgnCasqry/j7o4nYc6s/Bbu\n Xo2D2Bzb2xAw=="
        ],
        "X-Amp-File-Uploaded": "False",
        "Precedence": "list",
        "X-Mailman-Version": "2.1.15",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "List-Post": "<mailto:dev@dpdk.org>",
        "MIME-Version": "1.0",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "X-BeenThere": "dev@dpdk.org",
        "References": "<20200618054305.8097-1-junfeng.guo@intel.com>\n <20200708032739.156196-1-junfeng.guo@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v5 2/2] net/iavf: add RSS support for ipv4 ipv6\n\tmix of GTP",
        "Sender": "\"dev\" <dev-bounces@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 E1F44A00BE;\n\tWed,  8 Jul 2020 05:29:41 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CB9331DDAB;\n\tWed,  8 Jul 2020 05:29:34 +0200 (CEST)",
            "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n by dpdk.org (Postfix) with ESMTP id BF4B31DDE3\n for <dev@dpdk.org>; Wed,  8 Jul 2020 05:29:31 +0200 (CEST)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 07 Jul 2020 20:29:30 -0700",
            "from dpdk-junfengguo-v3.sh.intel.com ([10.67.119.146])\n by orsmga001.jf.intel.com with ESMTP; 07 Jul 2020 20:29:26 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "X-Mailer": "git-send-email 2.25.1",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "X-ExtLoop1": "1",
        "Date": "Wed,  8 Jul 2020 11:27:39 +0800",
        "Content-Transfer-Encoding": "8bit",
        "To": "qi.z.zhang@intel.com,\n\txiaolong.ye@intel.com,\n\tbeilei.xing@intel.com",
        "From": "Junfeng Guo <junfeng.guo@intel.com>",
        "In-Reply-To": "<20200708032739.156196-1-junfeng.guo@intel.com>",
        "Cc": "dev@dpdk.org, jia.guo@intel.com, junfeng.guo@intel.com, simei.su@intel.com",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Message-Id": "<20200708032739.156196-3-junfeng.guo@intel.com>",
        "Return-Path": "<dev-bounces@dpdk.org>"
    },
    "content": "RSS for GTP with outer & inner ipv4 & ipv6 combination are supported\nin this patch, so that we can process RSS based on inner 5 tuples or\n3 tuples of all the cases below of GTP packets:\n        1. ipv4 (outer) + ipv4 (inner)\n        2. ipv4 (outer) + ipv6 (inner)\n        3. ipv6 (outer) + ipv4 (inner)\n        4. ipv6 (outer) + ipv6 (inner)\n\nSigned-off-by: Junfeng Guo <junfeng.guo@intel.com>\n---\n drivers/net/iavf/iavf_generic_flow.c |  283 +++-\n drivers/net/iavf/iavf_generic_flow.h |   39 +\n drivers/net/iavf/iavf_hash.c         | 1976 ++++++++++++++++++++++++--\n 3 files changed, 2142 insertions(+), 156 deletions(-)",
    "diff": "diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c\nindex c6d48f081..321a4dca9 100644\n--- a/drivers/net/iavf/iavf_generic_flow.c\n+++ b/drivers/net/iavf/iavf_generic_flow.c\n@@ -361,6 +361,156 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+/* IPV4 GTPU IPv6 */\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+/* IPV6 GTPU IPv4 */\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+/* IPV6 GTPU IPv6 */\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n /* IPV4 GTPU EH IPv4 */\n enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n@@ -392,7 +542,6 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = {\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_END,\n-\n };\n \n enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {\n@@ -406,6 +555,138 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = {\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n+/* IPV4 GTPU EH IPv6 */\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+/* IPV6 GTPU EH IPv4 */\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+/* IPV6 GTPU EH IPv6 */\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_icmp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_GTP_PSC,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_ICMP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n /* ESP */\n enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\ndiff --git a/drivers/net/iavf/iavf_generic_flow.h b/drivers/net/iavf/iavf_generic_flow.h\nindex 8a6687542..f365cc322 100644\n--- a/drivers/net/iavf/iavf_generic_flow.h\n+++ b/drivers/net/iavf/iavf_generic_flow.h\n@@ -192,6 +192,27 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];\n \n /* IPv4 GTPU IPv4 */\n extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[];\n+\n+/* IPv4 GTPU IPv6 */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_icmp[];\n+\n+/* IPv6 GTPU IPv4 */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_icmp[];\n+\n+/* IPv6 GTPU IPv6 */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_icmp[];\n \n /* IPv4 GTPU EH IPv4 */\n extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];\n@@ -199,6 +220,24 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[];\n extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];\n extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[];\n \n+/* IPv4 GTPU EH IPv6 */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_icmp[];\n+\n+/* IPv6 GTPU EH IPv4 */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_icmp[];\n+\n+/* IPv6 GTPU EH IPv6 */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_icmp[];\n+\n /* ESP */\n extern enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[];\n extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[];\ndiff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex 1394519e7..967e6b64b 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -37,6 +37,10 @@ enum iavf_pattern_hint_type {\n \tIAVF_PHINT_IPV4_GTPU_EH\t\t\t= 0x00000200,\n \tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK\t\t= 0x00000400,\n \tIAVF_PHINT_IPV4_GTPU_EH_UPLINK\t\t= 0x00000800,\n+\tIAVF_PHINT_IPV6_GTPU_IP\t\t\t= 0x00001000,\n+\tIAVF_PHINT_IPV6_GTPU_EH\t\t\t= 0x00002000,\n+\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK\t\t= 0x00004000,\n+\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK\t\t= 0x00008000,\n };\n \n #define IAVF_GTPU_EH_DWNLINK\t0\n@@ -95,12 +99,52 @@ static struct iavf_pattern_match_type phint_eth_ipv4_sctp = {\n \tIAVF_PHINT_IPV4_SCTP};\n static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4 = {\n \tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_udp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_tcp = {\n+\tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_udp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_tcp = {\n+\tIAVF_PHINT_IPV6_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4 = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_udp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_tcp = {\n+\tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_udp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_tcp = {\n+\tIAVF_PHINT_IPV6_TCP};\n static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = {\n \tIAVF_PHINT_IPV4};\n static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = {\n \tIAVF_PHINT_IPV4_UDP};\n static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = {\n \tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_udp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_tcp = {\n+\tIAVF_PHINT_IPV6_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4 = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_udp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_tcp = {\n+\tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_udp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_tcp = {\n+\tIAVF_PHINT_IPV6_TCP};\n static struct iavf_pattern_match_type phint_eth_ipv4_esp = {\n \tIAVF_PHINT_IPV4};\n static struct iavf_pattern_match_type phint_eth_ipv4_udp_esp = {\n@@ -159,12 +203,52 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp},\n \t{iavf_pattern_eth_ipv4_gtpu_ipv4, IAVF_INSET_NONE,\n \t\t\t\t\t&phint_eth_ipv4_gtpu_ipv4},\n+\t{iavf_pattern_eth_ipv4_gtpu_ipv4_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_ipv4_udp},\n+\t{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_ipv4_tcp},\n+\t{iavf_pattern_eth_ipv4_gtpu_ipv6, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_ipv6},\n+\t{iavf_pattern_eth_ipv4_gtpu_ipv6_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_ipv6_udp},\n+\t{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_ipv6_tcp},\n+\t{iavf_pattern_eth_ipv6_gtpu_ipv4, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_ipv4},\n+\t{iavf_pattern_eth_ipv6_gtpu_ipv4_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_ipv4_udp},\n+\t{iavf_pattern_eth_ipv6_gtpu_ipv4_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_ipv4_tcp},\n+\t{iavf_pattern_eth_ipv6_gtpu_ipv6, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_ipv6},\n+\t{iavf_pattern_eth_ipv6_gtpu_ipv6_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_ipv6_udp},\n+\t{iavf_pattern_eth_ipv6_gtpu_ipv6_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_ipv6_tcp},\n \t{iavf_pattern_eth_ipv4_gtpu_eh_ipv4, IAVF_INSET_NONE,\n \t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv4},\n \t{iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,\n \t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv4_udp},\n \t{iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,\n \t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv4_tcp},\n+\t{iavf_pattern_eth_ipv4_gtpu_eh_ipv6, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv6},\n+\t{iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv6_udp},\n+\t{iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv6_tcp},\n+\t{iavf_pattern_eth_ipv6_gtpu_eh_ipv4, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_eh_ipv4},\n+\t{iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_eh_ipv4_udp},\n+\t{iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_eh_ipv4_tcp},\n+\t{iavf_pattern_eth_ipv6_gtpu_eh_ipv6, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_eh_ipv6},\n+\t{iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_eh_ipv6_udp},\n+\t{iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_ipv6_gtpu_eh_ipv6_tcp},\n \t{iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},\n \t{iavf_pattern_eth_ipv4_udp_esp, IAVF_INSET_NONE,\n \t\t\t\t\t&phint_eth_ipv4_udp_esp},\n@@ -641,7 +725,8 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_esp = {\n \tproto_hint_udp_only, proto_hint_esp }\n };\n \n-/* GTPU IP */\n+/* IPv4 GTPU IP */\n+\n struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_ip = {\n \tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,\n \tproto_hint_ipv4_src }\n@@ -657,11 +742,168 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_ip = {\n \tproto_hint_ipv4 }\n };\n \n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_only_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_only_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_only_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_src_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_src_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_src_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_dst_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_prot, proto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv4_prot, proto_hint_tcp}\n+};\n+\n struct virtchnl_proto_hdrs hdrs_hint_teid_gtpu_ip = {\n \tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_teid}\n };\n \n-/* GTPU EH */\n+/* IPv6 GTPU IP */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,\n+\t\tproto_hint_ipv6_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,\n+\t\tproto_hint_ipv6_dst }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,\n+\t\tproto_hint_ipv6 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_prot, proto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_ip = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,\n+\tproto_hint_ipv6_prot, proto_hint_tcp}\n+};\n+\n+/* IPv4 GTPU EH */\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_eh = {\n \tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n@@ -748,7 +990,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {\n \tproto_hint_ipv4_prot, proto_hint_tcp}\n };\n \n-/* GTPU UP */\n+/* IPv6 GTPU EH */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_dst }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_prot, proto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv6_prot, proto_hint_tcp}\n+};\n+\n+/* IPv4 GTPU UP */\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_up = {\n \tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n@@ -835,7 +1164,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {\n \tproto_hint_ipv4_prot, proto_hint_tcp}\n };\n \n-/* GTPU DWN */\n+/* IPv6 GTPU UP */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_dst }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_prot, proto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv6_prot, proto_hint_tcp}\n+};\n+\n+/* IPv4 GTPU DWN */\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_dwn = {\n \tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n@@ -922,70 +1338,157 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {\n \tproto_hint_ipv4_prot, proto_hint_tcp}\n };\n \n-/* IPV6 */\n+/* IPv6 GTPU DWN */\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6 = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,\n-\tproto_hint_ipv6_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_src_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_udp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n-\tproto_hint_ipv6_only, proto_hint_udp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_udp_dst_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_tcp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n-\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_src_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_sctp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n-\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6 = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,\n-\tproto_hint_ipv6_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_src }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_udp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n-\tproto_hint_ipv6_only, proto_hint_udp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_src_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_tcp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n-\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_udp_dst_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_sctp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n-\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_src_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6 = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,\n-\tproto_hint_ipv6_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_udp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n-\tproto_hint_ipv6_only, proto_hint_udp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_dst }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_tcp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n-\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6 }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_sctp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n-\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_src_port}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6 = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_prot, proto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv6_prot, proto_hint_tcp}\n+};\n+\n+/* IPV6 */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only, proto_hint_udp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only, proto_hint_udp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,\n+\tproto_hint_ipv6_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv6_only, proto_hint_udp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,\n \tproto_hint_ipv6_only}\n };\n \n@@ -1540,7 +2043,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {\n struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t/* GTPU */\n \t/* GTPU IP */\n-\t/* GTPU IPV4*/\n+\t/* IPv4 GTPU IP IPv4*/\n \t{ETH_RSS_L3_SRC_ONLY,\n \t\t&hdrs_hint_ipv4_src_gtpu_ip,\n \t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},\n@@ -1561,173 +2064,850 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t{ETH_RSS_GTPU,\n \t\t&hdrs_hint_teid_gtpu_ip,\n \t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},\n-\t/* GTPU EH */\n-\t/* Inner IPV4 */\n-\t{ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n-\t{ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t/* IPv4 GTPU IP IPv6*/\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_GTPU,\n+\t\t&hdrs_hint_teid_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},\n+\t/* IPv6 GTPU IP IPv4*/\n \t{ETH_RSS_IPV4 |\n \t\tETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},\n \t{ETH_RSS_IPV4 |\n \t\tETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},\n \t{ETH_RSS_IPV4,\n-\t\t&hdrs_hint_ipv4_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n-\t/* Inner IPV4->UDP */\n+\t\t&hdrs_hint_ipv4_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_GTPU,\n+\t\t&hdrs_hint_teid_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},\n+\t/* IPv6 GTPU IP IPv6*/\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_GTPU,\n+\t\t&hdrs_hint_teid_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},\n+\t/* IPv4 GTPU IP IPv4 UDP */\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L3_DST_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L3_DST_ONLY |\n \t\tETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n \t{ETH_RSS_NONFRAG_IPV4_UDP,\n-\t\t&hdrs_hint_ipv4_udp_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n-\t/* Inner IPV4->TCP */\n+\t\t&hdrs_hint_ipv4_udp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t/* IPv4 GTPU IP IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv6 GTPU IP IPv4 UDP */\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},\n+\t/* IPv6 GTPU IP IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv4 GTPU IP IPv4 TCP */\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L3_DST_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L3_DST_ONLY |\n \t\tETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n \t{ETH_RSS_NONFRAG_IPV4_TCP,\n-\t\t&hdrs_hint_ipv4_tcp_gtpu_eh,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n-\t/* GTPU EH UP */\n-\t/* Inner IPV4 */\n-\t{ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_up,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n-\t{ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n-\t{ETH_RSS_IPV4 |\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv4 GTPU IP IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_gtpu_up,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n-\t{ETH_RSS_IPV4 |\n-\t\tETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n-\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n-\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv6_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t/* IPv6 GTPU IP IPv4 TCP */\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv6 GTPU IP IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_ip,\n+\t\tIAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},\n+\t/* GTPU EH */\n+\t/* IPv4 GTPU EH IPv4 */\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t/* IPv4 GTPU EH IPv6 */\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},\n+\t/* IPv6 GTPU EH IPv4 */\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},\n+\t/* IPv6 GTPU EH IPv6 */\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},\n+\t/* IPv4 GTPU EH IPv4 UDP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t/* IPv4 GTPU EH IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv6 GTPU EH IPv4 UDP */\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t/* IPv6 GTPU EH IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv4 GTPU EH IPv4 TCP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv4 GTPU EH IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t/* IPv6 GTPU EH IPv4 TCP */\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv6 GTPU EH IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},\n+\t/* GTPU EH UP */\n+\t/* IPv4 GTPU EH UP IPv4 */\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n \t\t&hdrs_hint_ipv4_gtpu_up,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n-\t/* Inner IPV4->UDP */\n+\t/* IPv4 GTPU EH UP IPv6 */\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},\n+\t/* IPv6 GTPU EH UP IPv4 */\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t/* IPv6 GTPU EH UP IPv6 */\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},\n+\t/* IPv4 GTPU EH UP IPv4 UDP */\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n \t\t&hdrs_hint_ipv4_src_udp_src_gtpu_up,\n@@ -1791,7 +2971,115 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t{ETH_RSS_NONFRAG_IPV4_UDP,\n \t\t&hdrs_hint_ipv4_udp_gtpu_up,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n-\t/* Inner IPV4->TCP */\n+\t/* IPv4 GTPU EH UP IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv6 GTPU EH UP IPv4 UDP */\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t/* IPv6 GTPU EH UP IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv4 GTPU EH UP IPv4 TCP */\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n \t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_up,\n@@ -1855,8 +3143,116 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t{ETH_RSS_NONFRAG_IPV4_TCP,\n \t\t&hdrs_hint_ipv4_tcp_gtpu_up,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv4 GTPU EH UP IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t/* IPv6 GTPU EH UP IPv4 TCP */\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv6 GTPU EH UP IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_up,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},\n \t/* GTPU EH DWN */\n-\t/* Inner IPV4 */\n+\t/* IPv4 GTPU EH DWN IPv4 */\n \t{ETH_RSS_L3_SRC_ONLY,\n \t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n@@ -1874,7 +3270,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t{ETH_RSS_IPV4,\n \t\t&hdrs_hint_ipv4_gtpu_dwn,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n-\t/* Inner IPV4->UDP */\n+\t/* IPv4 GTPU EH DWN IPv6 */\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},\n+\t/* IPv6 GTPU EH DWN IPv4 */\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t/* IPv6 GTPU EH DWN IPv6 */\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},\n+\t/* IPv4 GTPU EH DWN IPv4 UDP */\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n \t\t&hdrs_hint_ipv4_src_udp_src_gtpu_dwn,\n@@ -1938,7 +3370,115 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t{ETH_RSS_NONFRAG_IPV4_UDP,\n \t\t&hdrs_hint_ipv4_udp_gtpu_dwn,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n-\t/* Inner IPV4->TCP */\n+\t/* IPv4 GTPU EH DWN IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv6 GTPU EH DWN IPv4 UDP */\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t/* IPv6 GTPU EH DWN IPv6 UDP */\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},\n+\t/* IPv4 GTPU EH DWN IPv4 TCP */\n \t{ETH_RSS_L3_SRC_ONLY |\n \t\tETH_RSS_L4_SRC_ONLY,\n \t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,\n@@ -2002,6 +3542,114 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n \t{ETH_RSS_NONFRAG_IPV4_TCP,\n \t\t&hdrs_hint_ipv4_tcp_gtpu_dwn,\n \t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv4 GTPU EH DWN IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t/* IPv6 GTPU EH DWN IPv4 TCP */\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t/* IPv6 GTPU EH DWN IPv6 TCP */\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},\n };\n \n struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {\n@@ -2105,6 +3753,7 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,\n {\n \tconst struct rte_flow_item *item = pattern;\n \tconst struct rte_flow_item_gtp_psc *psc;\n+\tu8 outer_ipv6 = 0;\n \n \tfor (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {\n \t\tif (item->last) {\n@@ -2115,18 +3764,31 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,\n \t\t}\n \n \t\tswitch (item->type) {\n+\t\tcase RTE_FLOW_ITEM_TYPE_IPV6:\n+\t\t\touter_ipv6 = 1;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GTPU:\n-\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_IP;\n+\t\t\t*phint |= (outer_ipv6) ?\n+\t\t\t\tIAVF_PHINT_IPV6_GTPU_IP :\n+\t\t\t\tIAVF_PHINT_IPV4_GTPU_IP;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GTP_PSC:\n \t\t\tpsc = item->spec;\n-\t\t\t*phint &= ~IAVF_PHINT_IPV4_GTPU_IP;\n+\t\t\t*phint &= (outer_ipv6) ?\n+\t\t\t\t~IAVF_PHINT_IPV6_GTPU_IP :\n+\t\t\t\t~IAVF_PHINT_IPV4_GTPU_IP;\n \t\t\tif (!psc)\n-\t\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_EH;\n+\t\t\t\t*phint |= (outer_ipv6) ?\n+\t\t\t\t\tIAVF_PHINT_IPV6_GTPU_EH :\n+\t\t\t\t\tIAVF_PHINT_IPV4_GTPU_EH;\n \t\t\telse if (psc->pdu_type == IAVF_GTPU_EH_UPLINK)\n-\t\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_EH_UPLINK;\n+\t\t\t\t*phint |= (outer_ipv6) ?\n+\t\t\t\t\tIAVF_PHINT_IPV6_GTPU_EH_UPLINK :\n+\t\t\t\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK;\n \t\t\telse if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK)\n-\t\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_EH_DWNLINK;\n+\t\t\t\t*phint |= (outer_ipv6) ?\n+\t\t\t\t\tIAVF_PHINT_IPV6_GTPU_EH_DWNLINK :\n+\t\t\t\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tbreak;\n@@ -2201,7 +3863,11 @@ iavf_hash_parse_action(const struct rte_flow_action actions[],\n \t\t\tif ((pattern_hint & IAVF_PHINT_IPV4_GTPU_IP) ||\n \t\t\t    (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH) ||\n \t\t\t    (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_UPLINK) ||\n-\t\t\t    (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK)) {\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK) ||\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV6_GTPU_IP) ||\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH) ||\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_UPLINK) ||\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_DWNLINK)) {\n \t\t\t\thash_map_list = iavf_gtpu_hash_map_list;\n \t\t\t\tmlist_len = RTE_DIM(iavf_gtpu_hash_map_list);\n \t\t\t} else {\n",
    "prefixes": [
        "v5",
        "2/2"
    ]
}