Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
dpdk: code preparation for bumping to DPDK 22.11
[vpp.git]
/
src
/
plugins
/
dpdk
/
cryptodev
/
cryptodev.h
diff --git
a/src/plugins/dpdk/cryptodev/cryptodev.h
b/src/plugins/dpdk/cryptodev/cryptodev.h
index
53a0462
..
cf68e1d
100644
(file)
--- a/
src/plugins/dpdk/cryptodev/cryptodev.h
+++ b/
src/plugins/dpdk/cryptodev/cryptodev.h
@@
-81,10
+81,16
@@
typedef enum
CRYPTODEV_N_OP_TYPES,
} cryptodev_op_type_t;
CRYPTODEV_N_OP_TYPES,
} cryptodev_op_type_t;
+#if RTE_VERSION >= RTE_VERSION_NUM(22, 11, 0, 0)
+typedef void cryptodev_session_t;
+#else
+typedef struct rte_cryptodev_sym_session cryptodev_session_t;
+#endif
+
/* Cryptodev session data, one data per direction per numa */
typedef struct
{
/* Cryptodev session data, one data per direction per numa */
typedef struct
{
-
struct rte_cryptodev_sym_session
***keys;
+
cryptodev_session_t
***keys;
} cryptodev_key_t;
/* Replicate DPDK rte_cryptodev_sym_capability structure with key size ranges
} cryptodev_key_t;
/* Replicate DPDK rte_cryptodev_sym_capability structure with key size ranges
@@
-125,7
+131,9
@@
typedef struct
typedef struct
{
struct rte_mempool *sess_pool;
typedef struct
{
struct rte_mempool *sess_pool;
+#if RTE_VERSION < RTE_VERSION_NUM(22, 11, 0, 0)
struct rte_mempool *sess_priv_pool;
struct rte_mempool *sess_priv_pool;
+#endif
} cryptodev_session_pool_t;
typedef struct
} cryptodev_session_pool_t;
typedef struct
@@
-163,7
+171,7
@@
typedef struct
u16 aad_index;
u8 *aad_buf;
u64 aad_phy_addr;
u16 aad_index;
u8 *aad_buf;
u64 aad_phy_addr;
-
struct rte_cryptodev_sym_session
*reset_sess;
+
cryptodev_session_t
*reset_sess;
};
};
u16 cryptodev_id;
};
};
u16 cryptodev_id;
@@
-184,6
+192,9
@@
typedef struct
u32 sess_sz;
u32 drivers_cnt;
u8 is_raw_api;
u32 sess_sz;
u32 drivers_cnt;
u8 is_raw_api;
+#if RTE_VERSION >= RTE_VERSION_NUM(22, 11, 0, 0)
+ u8 driver_id;
+#endif
} cryptodev_main_t;
extern cryptodev_main_t cryptodev_main;
} cryptodev_main_t;
extern cryptodev_main_t cryptodev_main;