acl: deduplicate a bit of RT code

Move common check for input parameters up into rte_acl_classify_alg().

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

diff --git a/lib/librte_acl/acl_run_scalar.c b/lib/librte_acl/acl_run_scalar.c
index 9935125..5be216c 100644 (file)
--- a/lib/librte_acl/acl_run_scalar.c
+++ b/lib/librte_acl/acl_run_scalar.c
@@ -147,10 +147,6 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data,
        struct completion cmplt[MAX_SEARCHES_SCALAR];
        struct parms parms[MAX_SEARCHES_SCALAR];
 
-       if (categories != 1 &&
-               ((RTE_ACL_RESULTS_MULTIPLIER - 1) & categories) != 0)
-               return -EINVAL;
-
        acl_set_flow(&flows, cmplt, RTE_DIM(cmplt), data, results, num,
                categories, ctx->trans_table);
 

diff --git a/lib/librte_acl/acl_run_sse.c b/lib/librte_acl/acl_run_sse.c
index 576c92b..09e32be 100644 (file)
--- a/lib/librte_acl/acl_run_sse.c
+++ b/lib/librte_acl/acl_run_sse.c
@@ -572,10 +572,6 @@ int
 rte_acl_classify_sse(const struct rte_acl_ctx *ctx, const uint8_t **data,
        uint32_t *results, uint32_t num, uint32_t categories)
 {
-       if (categories != 1 &&
-               ((RTE_ACL_RESULTS_MULTIPLIER - 1) & categories) != 0)
-               return -EINVAL;
-
        if (likely(num >= MAX_SEARCHES_SSE8))
                return search_sse_8(ctx, data, results, num, categories);
        else if (num >= MAX_SEARCHES_SSE4)

diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c
index 547e6da..a16c4a4 100644 (file)
--- a/lib/librte_acl/rte_acl.c
+++ b/lib/librte_acl/rte_acl.c
@@ -75,21 +75,26 @@ rte_acl_init(void)
        rte_acl_set_default_classify(alg);
 }
 
-int
-rte_acl_classify(const struct rte_acl_ctx *ctx, const uint8_t **data,
-       uint32_t *results, uint32_t num, uint32_t categories)
-{
-       return classify_fns[ctx->alg](ctx, data, results, num, categories);
-}
-
 int
 rte_acl_classify_alg(const struct rte_acl_ctx *ctx, const uint8_t **data,
        uint32_t *results, uint32_t num, uint32_t categories,
        enum rte_acl_classify_alg alg)
 {
+       if (categories != 1 &&
+                       ((RTE_ACL_RESULTS_MULTIPLIER - 1) & categories) != 0)
+               return -EINVAL;
+
        return classify_fns[alg](ctx, data, results, num, categories);
 }
 
+int
+rte_acl_classify(const struct rte_acl_ctx *ctx, const uint8_t **data,
+       uint32_t *results, uint32_t num, uint32_t categories)
+{
+       return rte_acl_classify_alg(ctx, data, results, num, categories,
+               ctx->alg);
+}
+
 struct rte_acl_ctx *
 rte_acl_find_existing(const char *name)
 {