git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/iavf: check max SIMD bitwidth
[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
60183bb
..
45c69e6
100644
(file)
--- 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. */
}
/* 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 &=
(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. */
}
/* 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 |=
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);
(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);
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 {
(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.
filter_ptr->rss_cfg.hashed_flds,
filter_ptr->rss_cfg.packet_hdr);
/* Fixme: Ignore the error if a rule does not exist.