net/iavf: disable simple XOR RSS hash function
[dpdk.git] / drivers / net / iavf / iavf_hash.c
index 975c845..dfc6822 100644 (file)
 #include "iavf_generic_flow.h"
 
 enum iavf_pattern_hint_type {
-       IAVF_PATTERN_HINT_NONE,
-       IAVF_PATTERN_HINT_IPV4,
-       IAVF_PATTERN_HINT_IPV4_UDP,
-       IAVF_PATTERN_HINT_IPV4_TCP,
-       IAVF_PATTERN_HINT_IPV4_SCTP,
-       IAVF_PATTERN_HINT_IPV6,
-       IAVF_PATTERN_HINT_IPV6_UDP,
-       IAVF_PATTERN_HINT_IPV6_TCP,
-       IAVF_PATTERN_HINT_IPV6_SCTP,
+       IAVF_PHINT_NONE                         = 0x00000000,
+       IAVF_PHINT_IPV4                         = 0x00000001,
+       IAVF_PHINT_IPV4_UDP                     = 0x00000002,
+       IAVF_PHINT_IPV4_TCP                     = 0x00000004,
+       IAVF_PHINT_IPV4_SCTP                    = 0x00000008,
+       IAVF_PHINT_IPV6                         = 0x00000010,
+       IAVF_PHINT_IPV6_UDP                     = 0x00000020,
+       IAVF_PHINT_IPV6_TCP                     = 0x00000040,
+       IAVF_PHINT_IPV6_SCTP                    = 0x00000080,
+       IAVF_PHINT_IPV4_GTPU_IP                 = 0x00000100,
+       IAVF_PHINT_IPV4_GTPU_EH                 = 0x00000200,
+       IAVF_PHINT_IPV4_GTPU_EH_DWNLINK         = 0x00000400,
+       IAVF_PHINT_IPV4_GTPU_EH_UPLINK          = 0x00000800,
+       IAVF_PHINT_IPV6_GTPU_IP                 = 0x00001000,
+       IAVF_PHINT_IPV6_GTPU_EH                 = 0x00002000,
+       IAVF_PHINT_IPV6_GTPU_EH_DWNLINK         = 0x00004000,
+       IAVF_PHINT_IPV6_GTPU_EH_UPLINK          = 0x00008000,
 };
 
+#define IAVF_GTPU_EH_DWNLINK   0
+#define IAVF_GTPU_EH_UPLINK    1
+
 struct iavf_pattern_match_type {
-       enum iavf_pattern_hint_type phint_type;
+       uint64_t pattern_hint;
 };
 
 struct iavf_hash_match_type {
-       enum iavf_pattern_hint_type phint_type;
        uint64_t hash_type;
        struct virtchnl_proto_hdrs *proto_hdrs;
+       uint64_t pattern_hint;
 };
 
 struct iavf_rss_meta {
@@ -76,42 +87,108 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,
                               void **meta,
                               struct rte_flow_error *error);
 
-struct iavf_pattern_match_type phint_empty = {
-       IAVF_PATTERN_HINT_NONE};
-struct iavf_pattern_match_type phint_eth_ipv4 = {
-       IAVF_PATTERN_HINT_IPV4};
-struct iavf_pattern_match_type phint_eth_ipv4_udp = {
-       IAVF_PATTERN_HINT_IPV4_UDP};
-struct iavf_pattern_match_type phint_eth_ipv4_tcp = {
-       IAVF_PATTERN_HINT_IPV4_TCP};
-struct iavf_pattern_match_type phint_eth_ipv4_sctp = {
-       IAVF_PATTERN_HINT_IPV4_SCTP};
-struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh = {
-       IAVF_PATTERN_HINT_IPV4_UDP};
-struct iavf_pattern_match_type phint_eth_ipv4_esp = {
-       IAVF_PATTERN_HINT_IPV4};
-struct iavf_pattern_match_type phint_eth_ipv4_ah = {
-       IAVF_PATTERN_HINT_IPV4};
-struct iavf_pattern_match_type phint_eth_ipv4_l2tpv3 = {
-       IAVF_PATTERN_HINT_IPV4};
-struct iavf_pattern_match_type phint_eth_ipv4_pfcp = {
-       IAVF_PATTERN_HINT_IPV4_UDP};
-struct iavf_pattern_match_type phint_eth_ipv6 = {
-       IAVF_PATTERN_HINT_IPV6};
-struct iavf_pattern_match_type phint_eth_ipv6_udp = {
-       IAVF_PATTERN_HINT_IPV6_UDP};
-struct iavf_pattern_match_type phint_eth_ipv6_tcp = {
-       IAVF_PATTERN_HINT_IPV6_TCP};
-struct iavf_pattern_match_type phint_eth_ipv6_sctp = {
-       IAVF_PATTERN_HINT_IPV6_SCTP};
-struct iavf_pattern_match_type phint_eth_ipv6_esp = {
-       IAVF_PATTERN_HINT_IPV6};
-struct iavf_pattern_match_type phint_eth_ipv6_ah = {
-       IAVF_PATTERN_HINT_IPV6};
-struct iavf_pattern_match_type phint_eth_ipv6_l2tpv3 = {
-       IAVF_PATTERN_HINT_IPV6};
-struct iavf_pattern_match_type phint_eth_ipv6_pfcp = {
-       IAVF_PATTERN_HINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_empty = {
+       IAVF_PHINT_NONE};
+static struct iavf_pattern_match_type phint_eth_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_sctp = {
+       IAVF_PHINT_IPV4_SCTP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv4_esp = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_udp_esp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv4_ah = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_l2tpv3 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_ipv4_pfcp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv4 = {
+       IAVF_PHINT_IPV4};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv4_udp = {
+       IAVF_PHINT_IPV4_UDP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv4_tcp = {
+       IAVF_PHINT_IPV4_TCP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv4_sctp = {
+       IAVF_PHINT_IPV4_SCTP};
+static struct iavf_pattern_match_type phint_eth_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_ipv6_sctp = {
+       IAVF_PHINT_IPV6_SCTP};
+static struct iavf_pattern_match_type phint_eth_ipv6_esp = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_udp_esp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_ipv6_ah = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_l2tpv3 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_ipv6_pfcp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv6 = {
+       IAVF_PHINT_IPV6};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv6_udp = {
+       IAVF_PHINT_IPV6_UDP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv6_tcp = {
+       IAVF_PHINT_IPV6_TCP};
+static struct iavf_pattern_match_type phint_eth_vlan_ipv6_sctp = {
+       IAVF_PHINT_IPV6_SCTP};
 
 /**
  * Supported pattern for hash.
@@ -124,32 +201,89 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
        {iavf_pattern_eth_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_udp},
        {iavf_pattern_eth_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_tcp},
        {iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp},
-       {iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},
+       {iavf_pattern_eth_ipv4_gtpu_ipv4, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv4},
+       {iavf_pattern_eth_ipv4_gtpu_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv4_udp},
+       {iavf_pattern_eth_ipv4_gtpu_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv4_tcp},
+       {iavf_pattern_eth_ipv4_gtpu_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv6},
+       {iavf_pattern_eth_ipv4_gtpu_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv6_udp},
+       {iavf_pattern_eth_ipv4_gtpu_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_ipv6_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv4, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv4},
+       {iavf_pattern_eth_ipv6_gtpu_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv4_udp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv4_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv6},
+       {iavf_pattern_eth_ipv6_gtpu_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv6_udp},
+       {iavf_pattern_eth_ipv6_gtpu_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_ipv6_tcp},
        {iavf_pattern_eth_ipv4_gtpu_eh_ipv4, IAVF_INSET_NONE,
-                                               &phint_eth_ipv4_gtpu_eh},
+                                       &phint_eth_ipv4_gtpu_eh_ipv4},
        {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,
-                                               &phint_eth_ipv4_gtpu_eh},
+                                       &phint_eth_ipv4_gtpu_eh_ipv4_udp},
        {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,
-                                               &phint_eth_ipv4_gtpu_eh},
+                                       &phint_eth_ipv4_gtpu_eh_ipv4_tcp},
+       {iavf_pattern_eth_ipv4_gtpu_eh_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_eh_ipv6},
+       {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_eh_ipv6_udp},
+       {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_gtpu_eh_ipv6_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv4, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv4},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv4_udp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv4_tcp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv6, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv6},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv6_udp},
+       {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_gtpu_eh_ipv6_tcp},
        {iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},
+       {iavf_pattern_eth_ipv4_udp_esp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv4_udp_esp},
        {iavf_pattern_eth_ipv4_ah, IAVF_INSET_NONE, &phint_eth_ipv4_ah},
        {iavf_pattern_eth_ipv4_l2tpv3, IAVF_INSET_NONE,
-                                               &phint_eth_ipv4_l2tpv3},
+                                       &phint_eth_ipv4_l2tpv3},
        {iavf_pattern_eth_ipv4_pfcp, IAVF_INSET_NONE, &phint_eth_ipv4_pfcp},
+       {iavf_pattern_eth_vlan_ipv4, IAVF_INSET_NONE, &phint_eth_vlan_ipv4},
+       {iavf_pattern_eth_vlan_ipv4_udp, IAVF_INSET_NONE,
+                                       &phint_eth_vlan_ipv4_udp},
+       {iavf_pattern_eth_vlan_ipv4_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_vlan_ipv4_tcp},
+       {iavf_pattern_eth_vlan_ipv4_sctp, IAVF_INSET_NONE,
+                                       &phint_eth_vlan_ipv4_sctp},
+       {iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},
        {iavf_pattern_eth_ipv6_udp, IAVF_INSET_NONE, &phint_eth_ipv6_udp},
        {iavf_pattern_eth_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_tcp},
        {iavf_pattern_eth_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_sctp},
        {iavf_pattern_eth_ipv6_esp, IAVF_INSET_NONE, &phint_eth_ipv6_esp},
+       {iavf_pattern_eth_ipv6_udp_esp, IAVF_INSET_NONE,
+                                       &phint_eth_ipv6_udp_esp},
        {iavf_pattern_eth_ipv6_ah, IAVF_INSET_NONE, &phint_eth_ipv6_ah},
        {iavf_pattern_eth_ipv6_l2tpv3, IAVF_INSET_NONE,
-                                               &phint_eth_ipv6_l2tpv3},
+                                       &phint_eth_ipv6_l2tpv3},
        {iavf_pattern_eth_ipv6_pfcp, IAVF_INSET_NONE, &phint_eth_ipv6_pfcp},
+       {iavf_pattern_eth_vlan_ipv6, IAVF_INSET_NONE, &phint_eth_vlan_ipv6},
+       {iavf_pattern_eth_vlan_ipv6_udp, IAVF_INSET_NONE,
+                                       &phint_eth_vlan_ipv6_udp},
+       {iavf_pattern_eth_vlan_ipv6_tcp, IAVF_INSET_NONE,
+                                       &phint_eth_vlan_ipv6_tcp},
+       {iavf_pattern_eth_vlan_ipv6_sctp, IAVF_INSET_NONE,
+                                       &phint_eth_vlan_ipv6_sctp},
        {iavf_pattern_empty, IAVF_INSET_NONE, &phint_empty},
 };
 
-#define        GTP_EH_PDU_LINK_UP              1
-#define        GTP_EH_PDU_LINK_DWN             0
-
 #define TUNNEL_LEVEL_OUTER             0
 #define TUNNEL_LEVEL_FIRST_INNER       1
 
@@ -160,104 +294,169 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
 #define BUFF_NOUSED                    0
 #define FIELD_FOR_PROTO_ONLY           0
 
+#define FIELD_SELECTOR(proto_hdr_field) \
+               (1UL << ((proto_hdr_field) & PROTO_HDR_FIELD_MASK))
+
 #define proto_hint_eth_src { \
-       VIRTCHNL_PROTO_HDR_ETH, VIRTCHNL_PROTO_HDR_ETH_SRC, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_ETH, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_SRC), \
+       {BUFF_NOUSED } }
 
 #define proto_hint_eth_dst { \
-       VIRTCHNL_PROTO_HDR_ETH, VIRTCHNL_PROTO_HDR_ETH_DST, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_ETH, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_DST), \
+       {BUFF_NOUSED } }
 
 #define proto_hint_eth_only { \
        VIRTCHNL_PROTO_HDR_ETH, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
 
 #define proto_hint_eth { \
        VIRTCHNL_PROTO_HDR_ETH, \
-       VIRTCHNL_PROTO_HDR_ETH_SRC | VIRTCHNL_PROTO_HDR_ETH_DST, \
-       {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ETH_DST), {BUFF_NOUSED } }
 
 #define proto_hint_svlan { \
-       VIRTCHNL_PROTO_HDR_S_VLAN, VIRTCHNL_PROTO_HDR_S_VLAN_ID, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_S_VLAN, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_S_VLAN_ID), {BUFF_NOUSED } }
 
 #define proto_hint_cvlan { \
-       VIRTCHNL_PROTO_HDR_C_VLAN, VIRTCHNL_PROTO_HDR_C_VLAN_ID, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_C_VLAN, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_C_VLAN_ID), {BUFF_NOUSED } }
 
 #define proto_hint_ipv4_src { \
-       VIRTCHNL_PROTO_HDR_IPV4, VIRTCHNL_PROTO_HDR_IPV4_SRC, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_IPV4, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC), \
+       {BUFF_NOUSED } }
 
 #define proto_hint_ipv4_dst { \
-       VIRTCHNL_PROTO_HDR_IPV4, VIRTCHNL_PROTO_HDR_IPV4_DST, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_IPV4, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), \
+       {BUFF_NOUSED } }
 
 #define proto_hint_ipv4_only { \
        VIRTCHNL_PROTO_HDR_IPV4, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
 
 #define proto_hint_ipv4 { \
        VIRTCHNL_PROTO_HDR_IPV4, \
-       VIRTCHNL_PROTO_HDR_IPV4_SRC | VIRTCHNL_PROTO_HDR_IPV4_DST, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_src_prot { \
+       VIRTCHNL_PROTO_HDR_IPV4, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), \
        {BUFF_NOUSED } }
 
-#define proto_hint_udp_src_port { \
-       VIRTCHNL_PROTO_HDR_UDP, VIRTCHNL_PROTO_HDR_UDP_SRC_PORT, \
+#define proto_hint_ipv4_dst_prot { \
+       VIRTCHNL_PROTO_HDR_IPV4, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), \
        {BUFF_NOUSED } }
 
+#define proto_hint_ipv4_only_prot { \
+       VIRTCHNL_PROTO_HDR_IPV4, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_ipv4_prot { \
+       VIRTCHNL_PROTO_HDR_IPV4, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_udp_src_port { \
+       VIRTCHNL_PROTO_HDR_UDP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT), {BUFF_NOUSED } }
+
 #define proto_hint_udp_dst_port { \
-       VIRTCHNL_PROTO_HDR_UDP, VIRTCHNL_PROTO_HDR_UDP_DST_PORT, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_UDP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_DST_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_udp_only { \
        VIRTCHNL_PROTO_HDR_UDP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
 
 #define proto_hint_udp { \
        VIRTCHNL_PROTO_HDR_UDP, \
-       VIRTCHNL_PROTO_HDR_UDP_SRC_PORT | VIRTCHNL_PROTO_HDR_UDP_DST_PORT, \
-       {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_DST_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_tcp_src_port { \
-       VIRTCHNL_PROTO_HDR_TCP, VIRTCHNL_PROTO_HDR_TCP_SRC_PORT, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_TCP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_SRC_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_tcp_dst_port { \
-       VIRTCHNL_PROTO_HDR_TCP, VIRTCHNL_PROTO_HDR_TCP_DST_PORT, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_TCP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_DST_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_tcp_only { \
        VIRTCHNL_PROTO_HDR_TCP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
 
 #define proto_hint_tcp { \
        VIRTCHNL_PROTO_HDR_TCP, \
-       VIRTCHNL_PROTO_HDR_TCP_SRC_PORT | VIRTCHNL_PROTO_HDR_TCP_DST_PORT, \
-       {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_SRC_PORT) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_TCP_DST_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_sctp_src_port { \
-       VIRTCHNL_PROTO_HDR_SCTP, VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_SCTP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_sctp_dst_port { \
-       VIRTCHNL_PROTO_HDR_SCTP, VIRTCHNL_PROTO_HDR_SCTP_DST_PORT, \
-       {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_SCTP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_DST_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_sctp_only { \
        VIRTCHNL_PROTO_HDR_SCTP, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
 
 #define proto_hint_sctp { \
        VIRTCHNL_PROTO_HDR_SCTP, \
-       VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT | VIRTCHNL_PROTO_HDR_SCTP_DST_PORT, \
-       {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_SCTP_DST_PORT), {BUFF_NOUSED } }
 
 #define proto_hint_ipv6_src { \
-       VIRTCHNL_PROTO_HDR_IPV6, VIRTCHNL_PROTO_HDR_IPV6_SRC, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_IPV6, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC), \
+       {BUFF_NOUSED } }
 
 #define proto_hint_ipv6_dst { \
-       VIRTCHNL_PROTO_HDR_IPV6, VIRTCHNL_PROTO_HDR_IPV6_DST, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_IPV6, FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), \
+       {BUFF_NOUSED } }
 
 #define proto_hint_ipv6_only { \
        VIRTCHNL_PROTO_HDR_IPV6, FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
 
 #define proto_hint_ipv6 { \
        VIRTCHNL_PROTO_HDR_IPV6, \
-       VIRTCHNL_PROTO_HDR_IPV6_SRC | VIRTCHNL_PROTO_HDR_IPV6_DST, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_src_prot { \
+       VIRTCHNL_PROTO_HDR_IPV6, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), \
        {BUFF_NOUSED } }
 
+#define proto_hint_ipv6_dst_prot { \
+       VIRTCHNL_PROTO_HDR_IPV6, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), \
+       {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_only_prot { \
+       VIRTCHNL_PROTO_HDR_IPV6, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_ipv6_prot { \
+       VIRTCHNL_PROTO_HDR_IPV6, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST) | \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_ip_teid { \
+       VIRTCHNL_PROTO_HDR_GTPU_IP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_GTPU_IP_TEID), {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_eh_only { \
+       VIRTCHNL_PROTO_HDR_GTPU_EH, \
+       FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
+#define proto_hint_gtpu_ip_only { \
+       VIRTCHNL_PROTO_HDR_GTPU_IP, \
+       FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
+
 #define proto_hint_gtpu_up_only { \
        VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP, \
        FIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }
@@ -268,37 +467,120 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {
 
 #define proto_hint_esp { \
        VIRTCHNL_PROTO_HDR_ESP, \
-       VIRTCHNL_PROTO_HDR_ESP_SPI, {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ESP_SPI), {BUFF_NOUSED } }
 
 #define proto_hint_ah { \
        VIRTCHNL_PROTO_HDR_AH, \
-       VIRTCHNL_PROTO_HDR_AH_SPI, {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_AH_SPI), {BUFF_NOUSED } }
 
 #define proto_hint_l2tpv3 { \
        VIRTCHNL_PROTO_HDR_L2TPV3, \
-       VIRTCHNL_PROTO_HDR_L2TPV3_SESS_ID, {BUFF_NOUSED } }
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_L2TPV3_SESS_ID), {BUFF_NOUSED } }
 
 #define proto_hint_pfcp { \
-       VIRTCHNL_PROTO_HDR_PFCP, VIRTCHNL_PROTO_HDR_PFCP_SEID, {BUFF_NOUSED } }
+       VIRTCHNL_PROTO_HDR_PFCP, \
+       FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED } }
+
+/* IPV4 */
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,
+       proto_hint_ipv4_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv4_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv4_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv4_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,
+       proto_hint_ipv4_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv4_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv4_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv4_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,
+       proto_hint_ipv4_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv4_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv4_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv4_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,
+       proto_hint_ipv4_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,
+       proto_hint_ipv4_only, proto_hint_udp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,
+       proto_hint_ipv4_only, proto_hint_tcp_only}
+};
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_src = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth_src }
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,
+       proto_hint_ipv4_only, proto_hint_sctp_only}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth_dst = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth_dst }
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_cvlan,
+       proto_hint_ipv4_only}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_eth = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth }
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,
+       proto_hint_ipv4_only, proto_hint_udp_only}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_svlan = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_svlan }
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,
+       proto_hint_ipv4_only, proto_hint_tcp_only}
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_cvlan = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_cvlan }
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,
+       proto_hint_ipv4_only, proto_hint_sctp_only}
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_src = {
@@ -309,107 +591,122 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst = {
        TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_dst }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_up = {
-       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
-       proto_hint_ipv4_src }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4 }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_dwn = {
-       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
-       proto_hint_ipv4_dst }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+       proto_hint_udp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4_esp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
-       proto_hint_esp }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+       proto_hint_udp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4_ah = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
-       proto_hint_ah }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_only = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
+       proto_hint_udp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4_l2tpv3 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
-       proto_hint_l2tpv3 }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+       proto_hint_tcp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4_pfcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
-       proto_hint_pfcp }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+       proto_hint_tcp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv4 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4 }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_only = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
+       proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
+       proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
+       proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp_only = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
+       proto_hint_sctp_only }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
        proto_hint_udp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
        proto_hint_udp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
        proto_hint_udp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
        proto_hint_udp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
        proto_hint_udp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
        proto_hint_udp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
        proto_hint_udp }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
        proto_hint_tcp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot,
        proto_hint_tcp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
        proto_hint_tcp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot,
        proto_hint_tcp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
        proto_hint_tcp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only_prot,
        proto_hint_tcp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot,
        proto_hint_tcp }
 };
 
@@ -448,105 +745,1197 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp = {
        proto_hint_sctp }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_src }
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_esp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       proto_hint_esp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_ah = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       proto_hint_ah }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_l2tpv3 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       proto_hint_l2tpv3 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_pfcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,
+       proto_hint_pfcp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_esp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_ipv4_only,
+       proto_hint_udp_only, proto_hint_esp }
+};
+
+/* IPv4 GTPU IP */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv4_prot, proto_hint_tcp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_teid_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_teid}
+};
+
+/* IPv6 GTPU IP */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+               proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+               proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only,
+               proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_ip = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPv4 GTPU EH */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv4_prot, proto_hint_tcp}
+};
+
+/* IPv6 GTPU EH */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_eh = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPv4 GTPU UP */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv4_prot, proto_hint_tcp}
+};
+
+/* IPv6 GTPU UP */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_up = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPv4 GTPU DWN */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv4_prot, proto_hint_tcp}
+};
+
+/* IPv6 GTPU DWN */
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_prot, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_prot, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_prot, proto_hint_udp}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_dwn = {
+       TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only,
+       proto_hint_ipv6_prot, proto_hint_tcp}
+};
+
+/* IPV6 */
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,
+       proto_hint_ipv6_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv6_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv6_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,
+       proto_hint_ipv6_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,
+       proto_hint_ipv6_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv6_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv6_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,
+       proto_hint_ipv6_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,
+       proto_hint_ipv6_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv6_only, proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv6_only, proto_hint_tcp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,
+       proto_hint_ipv6_only, proto_hint_sctp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,
+       proto_hint_ipv6_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,
+       proto_hint_ipv6_only, proto_hint_udp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,
+       proto_hint_ipv6_only, proto_hint_tcp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,
+       proto_hint_ipv6_only, proto_hint_sctp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_cvlan,
+       proto_hint_ipv6_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,
+       proto_hint_ipv6_only, proto_hint_udp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,
+       proto_hint_ipv6_only, proto_hint_tcp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,
+       proto_hint_ipv6_only, proto_hint_sctp_only}
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_src }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_dst }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+       proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+       proto_hint_udp_only }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_only = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
+       proto_hint_udp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_dst }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+       proto_hint_tcp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6_esp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
-       proto_hint_esp }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+       proto_hint_tcp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6_ah = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
-       proto_hint_ah }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_only = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
+       proto_hint_tcp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6_l2tpv3 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
-       proto_hint_l2tpv3 }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
+       proto_hint_sctp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6_pfcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
-       proto_hint_pfcp }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_sctp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
+       proto_hint_sctp_only }
 };
 
-struct virtchnl_proto_hdrs hdrs_hint_ipv6 = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6 }
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_only = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
+       proto_hint_sctp_only }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
        proto_hint_udp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
        proto_hint_udp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
        proto_hint_udp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
        proto_hint_udp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
        proto_hint_udp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
        proto_hint_udp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
        proto_hint_udp }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
        proto_hint_tcp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot,
        proto_hint_tcp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
        proto_hint_tcp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot,
        proto_hint_tcp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
        proto_hint_tcp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only_prot,
        proto_hint_tcp_dst_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot,
        proto_hint_tcp }
 };
 
@@ -571,12 +1960,12 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_sctp_dst_port = {
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_src_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
        proto_hint_sctp_src_port }
 };
 
 struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_dst_port = {
-       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
        proto_hint_sctp_dst_port }
 };
 
@@ -585,276 +1974,2023 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp = {
        proto_hint_sctp }
 };
 
-/**
- * The first member is pattern hint type,
- * the second member is hash type,
- * the third member is virtchnl protocol hdrs.
- */
-struct iavf_hash_match_type iavf_hash_type_list[] = {
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_esp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+       proto_hint_esp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_ah = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+       proto_hint_ah }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_l2tpv3 = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+       proto_hint_l2tpv3 }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_pfcp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,
+       proto_hint_pfcp }
+};
+
+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_esp = {
+       TUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_ipv6_only,
+       proto_hint_udp_only, proto_hint_esp }
+};
+
+struct iavf_hash_match_type iavf_hash_map_list[] = {
        /* IPV4 */
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2_SRC_ONLY, &hdrs_hint_eth_src},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2_DST_ONLY, &hdrs_hint_eth_dst},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,
-                                               &hdrs_hint_eth_src},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,
-                                               &hdrs_hint_eth_dst},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH, &hdrs_hint_eth},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_S_VLAN, &hdrs_hint_svlan},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_C_VLAN, &hdrs_hint_cvlan},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
-                                               &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
-                                               &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_ESP, &hdrs_hint_ipv4_esp},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_AH, &hdrs_hint_ipv4_ah},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2TPV3, &hdrs_hint_ipv4_l2tpv3},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4, &hdrs_hint_ipv4},
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv4, IAVF_PHINT_IPV4},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv4, IAVF_PHINT_IPV4},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv4, IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4, IAVF_PHINT_IPV4},
+       {ETH_RSS_ESP,
+               &hdrs_hint_ipv4_esp, IAVF_PHINT_IPV4},
+       {ETH_RSS_AH,
+               &hdrs_hint_ipv4_ah, IAVF_PHINT_IPV4},
+       {ETH_RSS_L2TPV3,
+               &hdrs_hint_ipv4_l2tpv3, IAVF_PHINT_IPV4},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv4, IAVF_PHINT_IPV4},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv4_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv4, IAVF_PHINT_IPV4},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv4_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
        /* IPV4 UDP */
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_src_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_src_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
-                                       &hdrs_hint_ipv4_src_gtpu_up},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_dst_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_dst_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
-                                       &hdrs_hint_ipv4_dst_gtpu_dwn},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv4_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv4_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv4_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+               &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
-               ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
-               &hdrs_hint_ipv4_src_gtpu_up},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
-               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+               &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_udp,
+               IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+               &hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
-               ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
-               &hdrs_hint_ipv4_dst_gtpu_dwn},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
-               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_PFCP,
-                                       &hdrs_hint_ipv4_pfcp},
-       {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP,
-                                       &hdrs_hint_ipv4_udp},
+               &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst_udp,
+               IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_PFCP,
+               &hdrs_hint_ipv4_pfcp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_ESP,
+               &hdrs_hint_ipv4_udp_esp, IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp, IAVF_PHINT_IPV4_UDP},
        /* IPV4 TCP */
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_src_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_src_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_dst_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_dst_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+               &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
-               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+               &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_tcp,
+               IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+               &hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
-               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP,
-                                       &hdrs_hint_ipv4_tcp},
+               &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst_tcp,
+               IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp, IAVF_PHINT_IPV4_TCP},
        /* IPV4 SCTP */
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_src_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_src_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_dst_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_dst_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_sctp, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_sctp, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_src_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+               &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_src_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
-               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+               &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP |
+               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_sctp,
+               IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv4_dst_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+               &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv4_dst_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
-               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv4_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv4_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP,
-                                       &hdrs_hint_ipv4_sctp},
+               &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP |
+               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst_sctp,
+               IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},
+       {ETH_RSS_NONFRAG_IPV4_SCTP,
+               &hdrs_hint_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},
        /* IPV6 */
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2_SRC_ONLY, &hdrs_hint_eth_src},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2_DST_ONLY, &hdrs_hint_eth_dst},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L2_SRC_ONLY,
-                                       &hdrs_hint_eth_src},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L2_DST_ONLY,
-                                       &hdrs_hint_eth_dst},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_ETH, &hdrs_hint_eth},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_S_VLAN, &hdrs_hint_svlan},
-       {IAVF_PATTERN_HINT_IPV4, ETH_RSS_C_VLAN, &hdrs_hint_cvlan},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_ESP, &hdrs_hint_ipv6_esp},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_AH, &hdrs_hint_ipv6_ah},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2TPV3, &hdrs_hint_ipv6_l2tpv3},
-       {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6, &hdrs_hint_ipv6},
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv6, IAVF_PHINT_IPV6},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv6, IAVF_PHINT_IPV6},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv6, IAVF_PHINT_IPV6},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6, IAVF_PHINT_IPV6},
+       {ETH_RSS_ESP,
+               &hdrs_hint_ipv6_esp, IAVF_PHINT_IPV6},
+       {ETH_RSS_AH,
+               &hdrs_hint_ipv6_ah, IAVF_PHINT_IPV6},
+       {ETH_RSS_L2TPV3,
+               &hdrs_hint_ipv6_l2tpv3, IAVF_PHINT_IPV6},
        /* IPV6 UDP */
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_src_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_dst_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv6_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv6_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv6_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv6_src_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+               &hdrs_hint_ipv6_src_udp_src_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv6_src_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
-               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+               &hdrs_hint_ipv6_src_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src_udp,
+               IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv6_dst_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+               &hdrs_hint_ipv6_dst_udp_src_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv6_dst_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
-               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_udp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_udp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_PFCP,
-                                       &hdrs_hint_ipv6_pfcp},
-       {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP,
-                                       &hdrs_hint_ipv6_udp},
+               &hdrs_hint_ipv6_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst_udp,
+               IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_port, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_PFCP,
+               &hdrs_hint_ipv6_pfcp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_ESP,
+               &hdrs_hint_ipv6_udp_esp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp, IAVF_PHINT_IPV6_UDP},
        /* IPV6 TCP */
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_src_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_dst_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv6_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv6_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv6_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv6_src_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+               &hdrs_hint_ipv6_src_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv6_src_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
-               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+               &hdrs_hint_ipv6_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src_tcp,
+               IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv6_dst_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+               &hdrs_hint_ipv6_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv6_dst_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
-               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_tcp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_tcp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP,
-                                       &hdrs_hint_ipv6_tcp},
+               &hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst_tcp,
+               IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_port, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp, IAVF_PHINT_IPV6_TCP},
        /* IPV6 SCTP */
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_src_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY,
-                                       &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_dst_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY,
-                                       &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+       {ETH_RSS_L2_SRC_ONLY,
+               &hdrs_hint_eth_src_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L2_DST_ONLY,
+               &hdrs_hint_eth_dst_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_ETH,
+               &hdrs_hint_eth_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP |
+               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src_sctp,
+               IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP |
+               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst_sctp,
+               IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_sctp_src_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_NONFRAG_IPV6_SCTP,
+               &hdrs_hint_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv6, IAVF_PHINT_IPV6},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv6_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv6_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_S_VLAN,
+               &hdrs_hint_svlan_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv6, IAVF_PHINT_IPV6},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv6_udp, IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv6_tcp, IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_C_VLAN,
+               &hdrs_hint_cvlan_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},
+};
+
+struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
+       /* GTPU */
+       /* GTPU IP */
+       /* IPv4 GTPU IP IPv4*/
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4},
+       /* IPv4 GTPU IP IPv6*/
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU IP IPv4*/
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU IP IPv6*/
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       {ETH_RSS_GTPU,
+               &hdrs_hint_teid_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU IP IPv4 UDP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       /* IPv4 GTPU IP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU IP IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU IP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU IP IPv4 TCP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU IP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_ip,
+               IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU IP IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU IP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_ip,
+               IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP},
+       /* GTPU EH */
+       /* IPv4 GTPU EH IPv4 */
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},
+       /* IPv4 GTPU EH IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU EH IPv4 */
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU EH IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU EH IPv4 UDP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       /* IPv4 GTPU EH IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU EH IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU EH IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU EH IPv4 TCP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU EH IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_eh,
+               IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU EH IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU EH IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_eh,
+               IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP},
+       /* GTPU EH UP */
+       /* IPv4 GTPU EH UP IPv4 */
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       /* IPv4 GTPU EH UP IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU EH UP IPv4 */
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU EH UP IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU EH UP IPv4 UDP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       /* IPv4 GTPU EH UP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU EH UP IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU EH UP IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU EH UP IPv4 TCP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU EH UP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_up,
+               IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU EH UP IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU EH UP IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_up,
+               IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP},
+       /* GTPU EH DWN */
+       /* IPv4 GTPU EH DWN IPv4 */
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       /* IPv4 GTPU EH DWN IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       /* IPv6 GTPU EH DWN IPv4 */
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       {ETH_RSS_IPV4,
+               &hdrs_hint_ipv4_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},
+       /* IPv6 GTPU EH DWN IPv6 */
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6 |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       {ETH_RSS_IPV6,
+               &hdrs_hint_ipv6_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6},
+       /* IPv4 GTPU EH DWN IPv4 UDP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       /* IPv4 GTPU EH DWN IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv6 GTPU EH DWN IPv4 UDP */
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               &hdrs_hint_ipv4_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},
+       /* IPv6 GTPU EH DWN IPv6 UDP */
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_udp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_udp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               &hdrs_hint_ipv6_udp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP},
+       /* IPv4 GTPU EH DWN IPv4 TCP */
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv4 GTPU EH DWN IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       /* IPv6 GTPU EH DWN IPv4 TCP */
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv4_src_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv4_dst_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv4_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               &hdrs_hint_ipv4_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},
+       /* IPv6 GTPU EH DWN IPv6 TCP */
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv6_src_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+               &hdrs_hint_ipv6_src_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv6_src_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
-               ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+               &hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_SRC_ONLY,
+               &hdrs_hint_ipv6_src_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_SRC_ONLY,
+               &hdrs_hint_ipv6_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
-               &hdrs_hint_ipv6_dst_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+               &hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
                ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
-               &hdrs_hint_ipv6_dst_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
-               ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L4_SRC_ONLY,
-                                       &hdrs_hint_ipv6_sctp_src_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L4_DST_ONLY,
-                                       &hdrs_hint_ipv6_sctp_dst_port},
-       {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP,
-                                       &hdrs_hint_ipv6_sctp},
+               &hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L3_DST_ONLY,
+               &hdrs_hint_ipv6_dst_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP |
+               ETH_RSS_L4_DST_ONLY,
+               &hdrs_hint_ipv6_tcp_dst_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               &hdrs_hint_ipv6_tcp_gtpu_dwn,
+               IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP},
+};
+
+struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
+       &hdrs_hint_ipv4,
+       &hdrs_hint_ipv4_udp,
+       &hdrs_hint_ipv4_tcp,
+       &hdrs_hint_ipv4_sctp,
+       &hdrs_hint_ipv6,
+       &hdrs_hint_ipv6_udp,
+       &hdrs_hint_ipv6_tcp,
+       &hdrs_hint_ipv6_sctp,
 };
 
 static struct iavf_flow_engine iavf_hash_engine = {
@@ -875,6 +4011,34 @@ static struct iavf_flow_parser iavf_hash_parser = {
        .stage = IAVF_FLOW_STAGE_RSS,
 };
 
+static int
+iavf_hash_default_set(struct iavf_adapter *ad, bool add)
+{
+       struct virtchnl_rss_cfg *rss_cfg;
+       uint16_t i;
+       int ret;
+
+       rss_cfg = rte_zmalloc("iavf rss rule",
+                             sizeof(struct virtchnl_rss_cfg), 0);
+       if (!rss_cfg)
+               return -ENOMEM;
+
+       for (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {
+               rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];
+               rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+
+               ret = iavf_add_del_rss_cfg(ad, rss_cfg, add);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "fail to %s RSS configure",
+                                   add ? "add" : "delete");
+                       rte_free(rss_cfg);
+                       return ret;
+               }
+       }
+
+       return ret;
+}
+
 RTE_INIT(iavf_hash_engine_init)
 {
        struct iavf_flow_engine *engine = &iavf_hash_engine;
@@ -887,6 +4051,7 @@ iavf_hash_init(struct iavf_adapter *ad)
 {
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
        struct iavf_flow_parser *parser;
+       int ret;
 
        if (!vf->vf_res)
                return -EINVAL;
@@ -896,14 +4061,29 @@ iavf_hash_init(struct iavf_adapter *ad)
 
        parser = &iavf_hash_parser;
 
-       return iavf_register_parser(parser, ad);
+       ret = iavf_register_parser(parser, ad);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "fail to register hash parser");
+               return ret;
+       }
+
+       ret = iavf_hash_default_set(ad, true);
+       if (ret) {
+               PMD_DRV_LOG(ERR, "fail to set default RSS");
+               iavf_unregister_parser(parser, ad);
+       }
+
+       return ret;
 }
 
 static int
-iavf_hash_check_inset(const struct rte_flow_item pattern[],
-                     struct rte_flow_error *error)
+iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,
+                       const struct rte_flow_item pattern[], uint64_t *phint,
+                       struct rte_flow_error *error)
 {
        const struct rte_flow_item *item = pattern;
+       const struct rte_flow_item_gtp_psc *psc;
+       u8 outer_ipv6 = 0;
 
        for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
                if (item->last) {
@@ -912,49 +4092,61 @@ iavf_hash_check_inset(const struct rte_flow_item pattern[],
                                           "Not support range");
                        return -rte_errno;
                }
-       }
 
-       return 0;
-}
-
-static uint64_t
-iavf_hash_refine_type(uint64_t rss_type, const struct rte_flow_item pattern[])
-{
-       const struct rte_flow_item *item;
-
-       for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
-               if (item->type == RTE_FLOW_ITEM_TYPE_GTP_PSC) {
-                       const struct rte_flow_item_gtp_psc *psc = item->spec;
-
-                       if (psc && (psc->pdu_type == GTP_EH_PDU_LINK_UP ||
-                                   psc->pdu_type == GTP_EH_PDU_LINK_DWN)) {
-                               rss_type |= ETH_RSS_GTPU;
-                       }
+               switch (item->type) {
+               case RTE_FLOW_ITEM_TYPE_IPV6:
+                       outer_ipv6 = 1;
+                       break;
+               case RTE_FLOW_ITEM_TYPE_GTPU:
+                       *phint |= (outer_ipv6) ?
+                               IAVF_PHINT_IPV6_GTPU_IP :
+                               IAVF_PHINT_IPV4_GTPU_IP;
+                       break;
+               case RTE_FLOW_ITEM_TYPE_GTP_PSC:
+                       psc = item->spec;
+                       *phint &= (outer_ipv6) ?
+                               ~IAVF_PHINT_IPV6_GTPU_IP :
+                               ~IAVF_PHINT_IPV4_GTPU_IP;
+                       if (!psc)
+                               *phint |= (outer_ipv6) ?
+                                       IAVF_PHINT_IPV6_GTPU_EH :
+                                       IAVF_PHINT_IPV4_GTPU_EH;
+                       else if (psc->pdu_type == IAVF_GTPU_EH_UPLINK)
+                               *phint |= (outer_ipv6) ?
+                                       IAVF_PHINT_IPV6_GTPU_EH_UPLINK :
+                                       IAVF_PHINT_IPV4_GTPU_EH_UPLINK;
+                       else if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK)
+                               *phint |= (outer_ipv6) ?
+                                       IAVF_PHINT_IPV6_GTPU_EH_DWNLINK :
+                                       IAVF_PHINT_IPV4_GTPU_EH_DWNLINK;
+                       break;
+               default:
+                       break;
                }
        }
 
-       return rss_type;
+       /* update and restore pattern hint */
+       *phint |= ((struct iavf_pattern_match_type *)
+                               (pattern_match_item->meta))->pattern_hint;
+
+       return 0;
 }
 
 static int
-iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,
-                      const struct rte_flow_item pattern[],
-                      const struct rte_flow_action actions[],
-                      void **meta, struct rte_flow_error *error)
+iavf_hash_parse_action(const struct rte_flow_action actions[],
+                      uint64_t pattern_hint, void **meta,
+                      struct rte_flow_error *error)
 {
        struct iavf_rss_meta *rss_meta = (struct iavf_rss_meta *)*meta;
-       uint32_t type_list_len = RTE_DIM(iavf_hash_type_list);
-       struct iavf_hash_match_type *type_match_item;
+       struct iavf_hash_match_type *hash_map_list;
        enum rte_flow_action_type action_type;
        const struct rte_flow_action_rss *rss;
        const struct rte_flow_action *action;
+       uint32_t mlist_len;
        bool item_found = false;
        uint64_t rss_type;
        uint16_t i;
 
-       struct iavf_pattern_match_type *tt = (struct iavf_pattern_match_type *)
-               (pattern_match_item->meta);
-
        /* Supported action is RSS. */
        for (action = actions; action->type !=
                RTE_FLOW_ACTION_TYPE_END; action++) {
@@ -964,25 +4156,21 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,
                        rss = action->conf;
                        rss_type = rss->types;
 
-                       /**
-                        * Check simultaneous use of SRC_ONLY and DST_ONLY
-                        * of the same level.
-                        */
-                       rss_type = rte_eth_rss_hf_refine(rss_type);
-
-                       /**
-                        * Refine the hash type base on some specific item of
-                        * the pattern, such as identify the gtpu hash.
-                        */
-                       rss_type = iavf_hash_refine_type(rss_type, pattern);
-
-                       /* Check if pattern is empty. */
-                       if (pattern_match_item->pattern_list !=
-                               iavf_pattern_empty && rss->func ==
-                               RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)
+                       if (rss->func ==
+                           RTE_ETH_HASH_FUNCTION_SIMPLE_XOR){
+                               rss_meta->rss_algorithm =
+                                       VIRTCHNL_RSS_ALG_XOR_ASYMMETRIC;
                                return rte_flow_error_set(error, ENOTSUP,
                                        RTE_FLOW_ERROR_TYPE_ACTION, action,
-                                       "Not supported flow");
+                                       "function simple_xor is not supported");
+                       } else if (rss->func ==
+                                  RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+                               rss_meta->rss_algorithm =
+                                       VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
+                       } else {
+                               rss_meta->rss_algorithm =
+                                       VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+                       }
 
                        if (rss->level)
                                return rte_flow_error_set(error, ENOTSUP,
@@ -999,47 +4187,40 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,
                                        RTE_FLOW_ERROR_TYPE_ACTION, action,
                                        "a non-NULL RSS queue is not supported");
 
-                       /* Check hash function and save it to rss_meta. */
-                       if (rss->func == RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)
-                               rss_meta->rss_algorithm =
-                                       VIRTCHNL_RSS_ALG_XOR_ASYMMETRIC;
-                       else if (rss->func ==
-                                RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ)
-                               rss_meta->rss_algorithm =
-                                       VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
-                       else
-                               rss_meta->rss_algorithm =
-                                       VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+                       /**
+                        * Check simultaneous use of SRC_ONLY and DST_ONLY
+                        * of the same level.
+                        */
+                       rss_type = rte_eth_rss_hf_refine(rss_type);
 
-                       type_match_item =
-                       rte_zmalloc("iavf_type_match_item",
-                                   sizeof(struct iavf_hash_match_type), 0);
-                       if (!type_match_item) {
-                               rte_flow_error_set(error, EINVAL,
-                                                  RTE_FLOW_ERROR_TYPE_HANDLE,
-                                                  NULL,
-                                                  "No memory for type_match_item");
-                               return -ENOMEM;
+                       if ((pattern_hint & IAVF_PHINT_IPV4_GTPU_IP) ||
+                           (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH) ||
+                           (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_UPLINK) ||
+                           (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_IP) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_UPLINK) ||
+                           (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_DWNLINK)) {
+                               hash_map_list = iavf_gtpu_hash_map_list;
+                               mlist_len = RTE_DIM(iavf_gtpu_hash_map_list);
+                       } else {
+                               hash_map_list = iavf_hash_map_list;
+                               mlist_len = RTE_DIM(iavf_hash_map_list);
                        }
 
                        /* Find matched proto hdrs according to hash type. */
-                       for (i = 0; i < type_list_len; i++) {
+                       for (i = 0; i < mlist_len; i++) {
                                struct iavf_hash_match_type *ht_map =
-                                       &iavf_hash_type_list[i];
+                                       &hash_map_list[i];
                                if (rss_type == ht_map->hash_type &&
-                                   tt->phint_type == ht_map->phint_type) {
-                                       type_match_item->hash_type =
-                                               ht_map->hash_type;
-                                       type_match_item->proto_hdrs =
-                                               ht_map->proto_hdrs;
+                                   pattern_hint == ht_map->pattern_hint) {
                                        rss_meta->proto_hdrs =
-                                               type_match_item->proto_hdrs;
+                                               ht_map->proto_hdrs;
                                        item_found = true;
+                                       break;
                                }
                        }
 
-                       rte_free(type_match_item);
-
                        if (!item_found)
                                return rte_flow_error_set(error, ENOTSUP,
                                        RTE_FLOW_ERROR_TYPE_ACTION, action,
@@ -1071,6 +4252,7 @@ iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad,
 {
        struct iavf_pattern_match_item *pattern_match_item;
        struct iavf_rss_meta *rss_meta_ptr;
+       uint64_t phint = IAVF_PHINT_NONE;
        int ret = 0;
 
        rss_meta_ptr = rte_zmalloc(NULL, sizeof(*rss_meta_ptr), 0);
@@ -1090,12 +4272,12 @@ iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad,
                goto error;
        }
 
-       ret = iavf_hash_check_inset(pattern, error);
+       ret = iavf_hash_parse_pattern(pattern_match_item, pattern, &phint,
+                                     error);
        if (ret)
                goto error;
 
-       /* Check rss action. */
-       ret = iavf_hash_parse_action(pattern_match_item, pattern, actions,
+       ret = iavf_hash_parse_action(actions, phint,
                                     (void **)&rss_meta_ptr, error);
 
 error:
@@ -1171,6 +4353,9 @@ iavf_hash_destroy(__rte_unused struct iavf_adapter *ad,
 static void
 iavf_hash_uninit(struct iavf_adapter *ad)
 {
+       if (iavf_hash_default_set(ad, false))
+               PMD_DRV_LOG(ERR, "fail to delete default RSS");
+
        iavf_unregister_parser(&iavf_hash_parser, ad);
 }