diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 8c7f13b01..53fe1133e 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -2007,10 +2007,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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,
@@ -2046,18 +2042,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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_PHINT_IPV4_UDP},
@@ -2076,10 +2060,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 	{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,
@@ -2097,18 +2077,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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_PHINT_IPV4_TCP},
@@ -2127,10 +2095,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 	{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,
@@ -2144,18 +2108,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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_PHINT_IPV4_SCTP},
@@ -2174,10 +2126,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 	{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,
@@ -2191,10 +2139,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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,
@@ -2214,18 +2158,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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_PHINT_IPV6_UDP},
@@ -2244,10 +2176,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 	{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,
@@ -2265,18 +2193,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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_PHINT_IPV6_TCP},
@@ -2295,10 +2211,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 	{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,
@@ -2312,18 +2224,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 		&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},
@@ -2342,10 +2242,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = {
 	{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,
@@ -2374,12 +2270,6 @@ 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,
@@ -2440,34 +2330,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -2612,34 +2474,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -2785,12 +2619,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		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,
@@ -2839,34 +2667,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -3011,34 +2811,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -3184,12 +2956,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		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,
@@ -3238,34 +3004,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -3410,34 +3148,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -3583,12 +3293,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		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,
@@ -3637,34 +3341,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
@@ -3809,34 +3485,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {
 		&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,
