net/hns3: increase time waiting for PF reset completion

[dpdk.git] / drivers / crypto / mlx5 / mlx5_crypto_dek.c

diff --git a/drivers/crypto/mlx5/mlx5_crypto_dek.c b/drivers/crypto/mlx5/mlx5_crypto_dek.c
index 67b1fa3..472ee37 100644 (file)
--- a/drivers/crypto/mlx5/mlx5_crypto_dek.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_dek.c
@@ -94,7 +94,7 @@ mlx5_crypto_dek_create_cb(void *tool_ctx __rte_unused, void *cb_ctx)
        struct mlx5_crypto_dek *dek = rte_zmalloc(__func__, sizeof(*dek),
                                                  RTE_CACHE_LINE_SIZE);
        struct mlx5_devx_dek_attr dek_attr = {
-               .pd = ctx->priv->pdn,
+               .pd = ctx->priv->cdev->pdn,
                .key_purpose = MLX5_CRYPTO_KEY_PURPOSE_AES_XTS,
                .has_keytag = 1,
        };
@@ -117,7 +117,8 @@ mlx5_crypto_dek_create_cb(void *tool_ctx __rte_unused, void *cb_ctx)
                return NULL;
        }
        memcpy(&dek_attr.key, cipher_ctx->key.data, cipher_ctx->key.length);
-       dek->obj = mlx5_devx_cmd_create_dek_obj(ctx->priv->ctx, &dek_attr);
+       dek->obj = mlx5_devx_cmd_create_dek_obj(ctx->priv->cdev->ctx,
+                                               &dek_attr);
        if (dek->obj == NULL) {
                rte_free(dek);
                return NULL;
@@ -155,6 +156,8 @@ mlx5_crypto_dek_setup(struct mlx5_crypto_priv *priv)
 void
 mlx5_crypto_dek_unset(struct mlx5_crypto_priv *priv)
 {
-       mlx5_hlist_destroy(priv->dek_hlist);
-       priv->dek_hlist = NULL;
+       if (priv->dek_hlist) {
+               mlx5_hlist_destroy(priv->dek_hlist);
+               priv->dek_hlist = NULL;
+       }
 }