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_op_data_path.c
diff --git
a/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c
b/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c
index
55be79c
..
66c0c16
100644
(file)
--- a/
src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c
+++ b/
src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c
@@
-127,7
+127,7
@@
cryptodev_frame_linked_algs_enqueue (vlib_main_t *vm,
clib_pmalloc_main_t *pm = vm->physmem_main.pmalloc_main;
cryptodev_engine_thread_t *cet = cmt->per_thread_data + vm->thread_index;
vnet_crypto_async_frame_elt_t *fe;
clib_pmalloc_main_t *pm = vm->physmem_main.pmalloc_main;
cryptodev_engine_thread_t *cet = cmt->per_thread_data + vm->thread_index;
vnet_crypto_async_frame_elt_t *fe;
-
struct rte_cryptodev_sym_session
*sess = 0;
+
cryptodev_session_t
*sess = 0;
cryptodev_op_t **cop;
u32 *bi;
u32 n_enqueue, n_elts;
cryptodev_op_t **cop;
u32 *bi;
u32 n_enqueue, n_elts;
@@
-246,7
+246,7
@@
cryptodev_frame_aead_enqueue (vlib_main_t *vm,
clib_pmalloc_main_t *pm = vm->physmem_main.pmalloc_main;
cryptodev_engine_thread_t *cet = cmt->per_thread_data + vm->thread_index;
vnet_crypto_async_frame_elt_t *fe;
clib_pmalloc_main_t *pm = vm->physmem_main.pmalloc_main;
cryptodev_engine_thread_t *cet = cmt->per_thread_data + vm->thread_index;
vnet_crypto_async_frame_elt_t *fe;
-
struct rte_cryptodev_sym_session
*sess = 0;
+
cryptodev_session_t
*sess = 0;
cryptodev_op_t **cop;
u32 *bi;
u32 n_enqueue = 0, n_elts;
cryptodev_op_t **cop;
u32 *bi;
u32 n_enqueue = 0, n_elts;
@@
-306,8
+306,13
@@
cryptodev_frame_aead_enqueue (vlib_main_t *vm,
}
}
else if (PREDICT_FALSE (
}
}
else if (PREDICT_FALSE (
- key->keys[vm->numa_node][op_type]->opaque_data !=
- aad_len))
+#if RTE_VERSION >= RTE_VERSION_NUM(22, 11, 0, 0)
+ rte_cryptodev_sym_session_opaque_data_get (
+ key->keys[vm->numa_node][op_type]) != (u64) aad_len
+#else
+ key->keys[vm->numa_node][op_type]->opaque_data != aad_len
+#endif
+ ))
{
cryptodev_sess_handler (vm, VNET_CRYPTO_KEY_OP_DEL,
fe->key_index, aad_len);
{
cryptodev_sess_handler (vm, VNET_CRYPTO_KEY_OP_DEL,
fe->key_index, aad_len);