X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fice%2Fice_hash.c;h=45c69e6bfdaa09adc9fe67454ae773cd57790e8a;hb=eca9a0d6c8436eba70e60873dd5625bd52a65262;hp=60183bb38cd871be9fcab54dcfa0e12c930b4f22;hpb=e7cc68c70736d6f6c901ea1a64ff90e163b85286;p=dpdk.git

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 60183bb38c..45c69e6bfd 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -1141,7 +1141,7 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 			}
 
 			/* update hash field for nat-t esp. */
-			if (rss_type == ETH_RSS_ESP &&
+			if (rss_type & ETH_RSS_ESP &&
 			    (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
 			     m->eth_rss_hint & ETH_RSS_NONFRAG_IPV6_UDP)) {
 				hash_meta->hash_flds &=
@@ -1151,7 +1151,10 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 			}
 
 			/* update hash field for gtpu eh/gtpu dwn/gtpu up. */
-			if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+			if (!(rss_type & ETH_RSS_GTPU)) {
+				break;
+			} else if (hash_meta->pkt_hdr &
+				   ICE_FLOW_SEG_HDR_GTPU_EH) {
 				hash_meta->hash_flds &=
 				~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
 				hash_meta->hash_flds |=
@@ -1277,7 +1280,7 @@ ice_hash_create(struct ice_adapter *ad,
 			(hash_function ==
 				RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
 
-		ret = ice_add_rss_cfg(hw, vsi->idx,
+		ret = ice_add_rss_cfg_wrap(pf, vsi->idx,
 				filter_ptr->rss_cfg.hashed_flds,
 				filter_ptr->rss_cfg.packet_hdr,
 				filter_ptr->rss_cfg.symm);
@@ -1321,7 +1324,7 @@ ice_hash_destroy(struct ice_adapter *ad,
 			(1 << VSIQF_HASH_CTL_HASH_SCHEME_S);
 		ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg);
 	} else {
-		ret = ice_rem_rss_cfg(hw, vsi->idx,
+		ret = ice_rem_rss_cfg_wrap(pf, vsi->idx,
 				filter_ptr->rss_cfg.hashed_flds,
 				filter_ptr->rss_cfg.packet_hdr);
 		/* Fixme: Ignore the error if a rule does not exist.