Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11.4
[deb_dpdk.git]
/
drivers
/
net
/
sfc
/
sfc_flow.c
diff --git
a/drivers/net/sfc/sfc_flow.c
b/drivers/net/sfc/sfc_flow.c
index
f2050f6
..
90ef5bf
100644
(file)
--- a/
drivers/net/sfc/sfc_flow.c
+++ b/
drivers/net/sfc/sfc_flow.c
@@
-107,7
+107,6
@@
sfc_flow_parse_init(const struct rte_flow_item *item,
const uint8_t *spec;
const uint8_t *mask;
const uint8_t *last;
const uint8_t *spec;
const uint8_t *mask;
const uint8_t *last;
- uint8_t match;
uint8_t supp;
unsigned int i;
uint8_t supp;
unsigned int i;
@@
-168,12
+167,11
@@
sfc_flow_parse_init(const struct rte_flow_item *item,
return -rte_errno;
}
return -rte_errno;
}
- /* Check that mask
and spec not asks
for more match than supp_mask */
+ /* Check that mask
does not ask
for more match than supp_mask */
for (i = 0; i < size; i++) {
for (i = 0; i < size; i++) {
- match = spec[i] | mask[i];
supp = ((const uint8_t *)supp_mask)[i];
supp = ((const uint8_t *)supp_mask)[i];
- if (
(match | supp) != supp
) {
+ if (
~supp & mask[i]
) {
rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ITEM, item,
"Item's field is not supported");
rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ITEM, item,
"Item's field is not supported");
@@
-332,7
+330,8
@@
sfc_flow_parse_vlan(const struct rte_flow_item *item,
* the outer tag and the next matches the inner tag.
*/
if (mask->tci == supp_mask.tci) {
* the outer tag and the next matches the inner tag.
*/
if (mask->tci == supp_mask.tci) {
- vid = rte_bswap16(spec->tci);
+ /* Apply mask to keep VID only */
+ vid = rte_bswap16(spec->tci & mask->tci);
if (!(efx_spec->efs_match_flags &
EFX_FILTER_MATCH_OUTER_VID)) {
if (!(efx_spec->efs_match_flags &
EFX_FILTER_MATCH_OUTER_VID)) {
@@
-1021,7
+1020,7
@@
fail_scale_tbl_set:
fail_filter_insert:
fail_scale_key_set:
fail_scale_mode_set:
fail_filter_insert:
fail_scale_key_set:
fail_scale_mode_set:
- if (
rss != NULL
)
+ if (
flow->rss
)
efx_rx_scale_context_free(sa->nic, spec->efs_rss_context);
fail_scale_context_alloc:
efx_rx_scale_context_free(sa->nic, spec->efs_rss_context);
fail_scale_context_alloc:
@@
-1126,8
+1125,6
@@
sfc_flow_parse(struct rte_eth_dev *dev,
struct sfc_adapter *sa = dev->data->dev_private;
int rc;
struct sfc_adapter *sa = dev->data->dev_private;
int rc;
- memset(&flow->spec, 0, sizeof(flow->spec));
-
rc = sfc_flow_parse_attr(attr, flow, error);
if (rc != 0)
goto fail_bad_value;
rc = sfc_flow_parse_attr(attr, flow, error);
if (rc != 0)
goto fail_bad_value;
@@
-1160,6
+1157,8
@@
sfc_flow_validate(struct rte_eth_dev *dev,
{
struct rte_flow flow;
{
struct rte_flow flow;
+ memset(&flow, 0, sizeof(flow));
+
return sfc_flow_parse(dev, attr, pattern, actions, &flow, error);
}
return sfc_flow_parse(dev, attr, pattern, actions, &flow, error);
}