net/mlx5: support flow hit action for aging

[dpdk.git] / drivers / crypto / dpaa_sec / dpaa_sec.h

diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h
index 3ecc7ea..3686996 100644 (file)
--- a/drivers/crypto/dpaa_sec/dpaa_sec.h
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright 2016 NXP
+ *   Copyright 2016-2020 NXP
  *
  */
 
@@ -98,7 +98,7 @@ struct sec_cdb {
 
        uint32_t sh_desc[DPAA_SEC_MAX_DESC_SIZE];
 };
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 /*!
  * The structure is to be filled by user as a part of
  * dpaa_sec_proto_ctxt for PDCP Protocol
@@ -109,7 +109,8 @@ struct sec_pdcp_ctxt {
        int8_t pkt_dir;/*!< PDCP Frame Direction 0:UL 1:DL*/
        int8_t hfn_ovd;/*!< Overwrite HFN per packet*/
        uint8_t sn_size;        /*!< Sequence number size, 5/7/12/15/18 */
-       uint32_t hfn_ovd_offset;/*!< offset from rte_crypto_op at which
+       uint8_t sdap_enabled;   /*!< SDAP header is enabled */
+       uint16_t hfn_ovd_offset;/*!< offset from rte_crypto_op at which
                                 * per packet hfn is stored
                                 */
        uint32_t hfn;   /*!< Hyper Frame Number */
@@ -117,12 +118,15 @@ struct sec_pdcp_ctxt {
 };
 #endif
 typedef struct dpaa_sec_session_entry {
+       struct sec_cdb cdb;     /**< cmd block associated with qp */
+       struct dpaa_sec_qp *qp[MAX_DPAA_CORES];
+       struct qman_fq *inq[MAX_DPAA_CORES];
        uint8_t dir;         /*!< Operation Direction */
        uint8_t ctxt;   /*!< Session Context Type */
        enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/
        enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/
        enum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        enum rte_security_session_protocol proto_alg; /*!< Security Algorithm*/
 #endif
        union {
@@ -165,13 +169,10 @@ typedef struct dpaa_sec_session_entry {
                        uint8_t auth_cipher_text;
                                /**< Authenticate/cipher ordering */
                };
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                struct sec_pdcp_ctxt pdcp;
 #endif
        };
-       struct dpaa_sec_qp *qp[MAX_DPAA_CORES];
-       struct qman_fq *inq[MAX_DPAA_CORES];
-       struct sec_cdb cdb;     /**< cmd block associated with qp */
 } dpaa_sec_session;
 
 struct dpaa_sec_qp {
@@ -568,7 +569,7 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
        RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
 };
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
        {       /* SNOW 3G (UIA2) */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,