[dpdk-stable] patch 'net/sfc: ignore spec bits not covered by mask' has been queued to LTS release 17.11.3
Yuanhan Liu
yliu at fridaylinux.org
Sun May 6 08:36:39 CEST 2018
Hi,
FYI, your patch has been queued to LTS release 17.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/09/18. So please
shout if anyone has objections.
Thanks.
--yliu
---
>From c3ec08aed095f45c21ebd4cb6d9d920d57e0ccdf Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
Date: Wed, 25 Apr 2018 18:18:34 +0100
Subject: [PATCH] net/sfc: ignore spec bits not covered by mask
[ upstream commit c43e0f690413fc7233b735e641f22e8eb47c50c0 ]
mask is a simple bit-mask applied before interpreting the contents
of spec and last.
Fixes: a9825ccf5bb8 ("net/sfc: support flow API filters")
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Reviewed-by: Andy Moreton <amoreton at solarflare.com>
Reviewed-by: Roman Zhukov <roman.zhukov at oktetlabs.ru>
---
drivers/net/sfc/sfc_flow.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index e770b98e8..fddc6706b 100644
--- 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;
- uint8_t match;
uint8_t supp;
unsigned int i;
@@ -168,12 +167,11 @@ sfc_flow_parse_init(const struct rte_flow_item *item,
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++) {
- match = spec[i] | 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");
--
2.11.0
More information about the stable
mailing list