New upstream version 17.11.3

[deb_dpdk.git] / drivers / crypto / scheduler / scheduler_pmd_ops.c

diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c b/drivers/crypto/scheduler/scheduler_pmd_ops.c
index d379534..75433db 100644 (file)
--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c
+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c
@@ -31,13 +31,11 @@
  */
 #include <string.h>
 
-#include <rte_config.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
-#include <rte_cryptodev_vdev.h>
 #include <rte_reorder.h>
 
 #include "scheduler_pmd_private.h"
@@ -76,6 +74,7 @@ scheduler_attach_init_slave(struct rte_cryptodev *dev)
                                sched_ctx->init_slave_names[i]);
 
                rte_free(sched_ctx->init_slave_names[i]);
+               sched_ctx->init_slave_names[i] = NULL;
 
                sched_ctx->nb_init_slaves -= 1;
        }
@@ -291,11 +290,15 @@ scheduler_pmd_close(struct rte_cryptodev *dev)
                }
        }
 
-       if (sched_ctx->private_ctx)
+       if (sched_ctx->private_ctx) {
                rte_free(sched_ctx->private_ctx);
+               sched_ctx->private_ctx = NULL;
+       }
 
-       if (sched_ctx->capabilities)
+       if (sched_ctx->capabilities) {
                rte_free(sched_ctx->capabilities);
+               sched_ctx->capabilities = NULL;
+       }
 
        return 0;
 }
@@ -347,7 +350,7 @@ scheduler_pmd_info_get(struct rte_cryptodev *dev,
 {
        struct scheduler_ctx *sched_ctx = dev->data->dev_private;
        uint32_t max_nb_sessions = sched_ctx->nb_slaves ?
-                       UINT32_MAX : RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_SESSIONS;
+                       UINT32_MAX : RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_SESSIONS;
        uint32_t i;
 
        if (!dev_info)