net/tap: fix interrupt vector array size

[dpdk.git] / drivers / net / ice / ice_hash.c

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 58a0c18..f2b1719 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -102,6 +102,7 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad,
                        uint32_t array_len,
                        const struct rte_flow_item pattern[],
                        const struct rte_flow_action actions[],
+                       uint32_t priority,
                        void **meta,
                        struct rte_flow_error *error);
 
@@ -110,7 +111,7 @@ struct ice_rss_hash_cfg ipv4_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER,
        ICE_FLOW_HASH_ETH | ICE_FLOW_HASH_IPV4,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -118,7 +119,7 @@ struct ice_rss_hash_cfg ipv4_udp_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
        ICE_FLOW_HASH_ETH | ICE_HASH_UDP_IPV4 | ICE_IPV4_PROT,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -126,7 +127,7 @@ struct ice_rss_hash_cfg ipv4_tcp_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ICE_FLOW_HASH_ETH | ICE_HASH_TCP_IPV4 | ICE_IPV4_PROT,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -134,7 +135,7 @@ struct ice_rss_hash_cfg ipv4_sctp_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV4 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
        ICE_FLOW_HASH_ETH | ICE_HASH_SCTP_IPV4 | ICE_IPV4_PROT,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -142,7 +143,7 @@ struct ice_rss_hash_cfg ipv6_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV6 |
        ICE_FLOW_SEG_HDR_IPV_OTHER,
        ICE_FLOW_HASH_ETH | ICE_FLOW_HASH_IPV6,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -150,7 +151,7 @@ struct ice_rss_hash_cfg ipv6_udp_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV6 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
        ICE_FLOW_HASH_ETH | ICE_HASH_UDP_IPV6 | ICE_IPV6_PROT,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -158,7 +159,7 @@ struct ice_rss_hash_cfg ipv6_tcp_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV6 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
        ICE_FLOW_HASH_ETH | ICE_HASH_TCP_IPV6 | ICE_IPV6_PROT,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -166,7 +167,7 @@ struct ice_rss_hash_cfg ipv6_sctp_tmplt = {
        ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV6 |
        ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
        ICE_FLOW_HASH_ETH | ICE_HASH_SCTP_IPV6 | ICE_IPV6_PROT,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -262,7 +263,7 @@ struct ice_rss_hash_cfg eth_ipv4_esp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_ESP,
        ICE_FLOW_HASH_ESP_SPI,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -270,7 +271,7 @@ struct ice_rss_hash_cfg eth_ipv4_udp_esp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_NAT_T_ESP,
        ICE_FLOW_HASH_NAT_T_ESP_SPI,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -278,7 +279,7 @@ struct ice_rss_hash_cfg eth_ipv4_ah_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_AH,
        ICE_FLOW_HASH_AH_SPI,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -286,7 +287,7 @@ struct ice_rss_hash_cfg eth_ipv4_l2tpv3_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_L2TPV3,
        ICE_FLOW_HASH_L2TPV3_SESS_ID,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -294,7 +295,7 @@ struct ice_rss_hash_cfg eth_ipv4_pfcp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_PFCP_SESSION,
        ICE_FLOW_HASH_PFCP_SEID,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -302,7 +303,7 @@ struct ice_rss_hash_cfg eth_ipv6_esp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_ESP,
        ICE_FLOW_HASH_ESP_SPI,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -310,7 +311,7 @@ struct ice_rss_hash_cfg eth_ipv6_udp_esp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_NAT_T_ESP,
        ICE_FLOW_HASH_NAT_T_ESP_SPI,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -318,7 +319,7 @@ struct ice_rss_hash_cfg eth_ipv6_ah_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_AH,
        ICE_FLOW_HASH_AH_SPI,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -326,7 +327,7 @@ struct ice_rss_hash_cfg eth_ipv6_l2tpv3_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_L2TPV3,
        ICE_FLOW_HASH_L2TPV3_SESS_ID,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -334,14 +335,14 @@ struct ice_rss_hash_cfg eth_ipv6_pfcp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_PFCP_SESSION,
        ICE_FLOW_HASH_PFCP_SEID,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
 struct ice_rss_hash_cfg pppoe_tmplt = {
        ICE_FLOW_SEG_HDR_ETH,
        ICE_FLOW_HASH_ETH | ICE_FLOW_HASH_PPPOE_SESS_ID,
-       ICE_RSS_ANY_HEADERS,
+       ICE_RSS_OUTER_HEADERS,
        0
 };
 
@@ -826,7 +827,9 @@ static void ice_refine_hash_cfg(struct ice_rss_hash_cfg *hash_cfg,
 
 static uint64_t invalid_rss_comb[] = {
        ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP,
+       ETH_RSS_IPV4 | ETH_RSS_NONFRAG_IPV4_TCP,
        ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_UDP,
+       ETH_RSS_IPV6 | ETH_RSS_NONFRAG_IPV6_TCP,
        RTE_ETH_RSS_L3_PRE40 |
        RTE_ETH_RSS_L3_PRE56 |
        RTE_ETH_RSS_L3_PRE96
@@ -983,6 +986,7 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad,
                        uint32_t array_len,
                        const struct rte_flow_item pattern[],
                        const struct rte_flow_action actions[],
+                       uint32_t priority __rte_unused,
                        void **meta,
                        struct rte_flow_error *error)
 {