net/virtio: fix in-order Tx path for split ring

[dpdk.git] / drivers / crypto / null / null_crypto_pmd.c

diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c
index 3d7caf1..d5e3064 100644 (file)
--- a/drivers/crypto/null/null_crypto_pmd.c
+++ b/drivers/crypto/null/null_crypto_pmd.c
@@ -78,7 +78,7 @@ get_session(struct null_crypto_qp *qp, struct rte_crypto_op *op)
        if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
                if (likely(sym_op->session != NULL))
                        sess = (struct null_crypto_session *)
-                                       get_session_private_data(
+                                       get_sym_session_private_data(
                                        sym_op->session, cryptodev_driver_id);
        } else {
                void *_sess = NULL;
@@ -87,7 +87,8 @@ get_session(struct null_crypto_qp *qp, struct rte_crypto_op *op)
                if (rte_mempool_get(qp->sess_mp, (void **)&_sess))
                        return NULL;
 
-               if (rte_mempool_get(qp->sess_mp, (void **)&_sess_private_data))
+               if (rte_mempool_get(qp->sess_mp_priv,
+                               (void **)&_sess_private_data))
                        return NULL;
 
                sess = (struct null_crypto_session *)_sess_private_data;
@@ -95,12 +96,12 @@ get_session(struct null_crypto_qp *qp, struct rte_crypto_op *op)
                if (unlikely(null_crypto_set_session_parameters(sess,
                                sym_op->xform) != 0)) {
                        rte_mempool_put(qp->sess_mp, _sess);
-                       rte_mempool_put(qp->sess_mp, _sess_private_data);
+                       rte_mempool_put(qp->sess_mp_priv, _sess_private_data);
                        sess = NULL;
                }
                sym_op->session = (struct rte_cryptodev_sym_session *)_sess;
-               set_session_private_data(sym_op->session, cryptodev_driver_id,
-                       _sess_private_data);
+               set_sym_session_private_data(op->sym->session,
+                               cryptodev_driver_id, _sess_private_data);
        }
 
        return sess;
@@ -247,9 +248,7 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_NULL_PMD,
 RTE_PMD_REGISTER_CRYPTO_DRIVER(null_crypto_drv, cryptodev_null_pmd_drv.driver,
                cryptodev_driver_id);
 
-RTE_INIT(null_init_log);
-static void
-null_init_log(void)
+RTE_INIT(null_init_log)
 {
        null_logtype_driver = rte_log_register("pmd.crypto.null");
 }