mbuf: use offset macro

[dpdk.git] / examples / dpdk_qat / crypto.c

diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c
index 318d47c..c03ea78 100644 (file)
--- a/examples/dpdk_qat/crypto.c
+++ b/examples/dpdk_qat/crypto.c
@@ -45,7 +45,6 @@
 #include <rte_debug.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_ether.h>
 #include <rte_malloc.h>
 #include <rte_launch.h>
@@ -183,7 +182,7 @@ struct glob_keys g_crypto_hash_keys = {
  *
  */
 #define PACKET_DATA_START_PHYS(p) \
-               ((p)->buf_physaddr + ((char *)p->data - (char *)p->buf_addr))
+               ((p)->buf_physaddr + (p)->data_off)
 
 /*
  * A fixed offset to where the crypto is to be performed, which is the first
@@ -339,7 +338,7 @@ get_crypto_instance_on_core(CpaInstanceHandle *pInstanceHandle,
        }
 
        pLocalInstanceHandles = rte_malloc("pLocalInstanceHandles",
-                       sizeof(CpaInstanceHandle) * numInstances, CACHE_LINE_SIZE);
+                       sizeof(CpaInstanceHandle) * numInstances, RTE_CACHE_LINE_SIZE);
 
        if (NULL == pLocalInstanceHandles) {
                return CPA_STATUS_FAIL;
@@ -773,8 +772,8 @@ enum crypto_result
 crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
 {
        CpaCySymDpOpData *opData =
-                       (CpaCySymDpOpData *) ((char *) (rte_buff->data)
-                                       + CRYPTO_OFFSET_TO_OPDATA);
+                       rte_pktmbuf_mtod_offset(rte_buff, CpaCySymDpOpData *,
+                                               CRYPTO_OFFSET_TO_OPDATA);
        uint32_t lcore_id;
 
        if (unlikely(c >= NUM_CRYPTO || h >= NUM_HMAC))
@@ -848,8 +847,8 @@ enum crypto_result
 crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
 {
 
-       CpaCySymDpOpData *opData = (void*) (((char *) rte_buff->data)
-                       + CRYPTO_OFFSET_TO_OPDATA);
+       CpaCySymDpOpData *opData = rte_pktmbuf_mtod_offset(rte_buff, void *,
+                                                          CRYPTO_OFFSET_TO_OPDATA);
        uint32_t lcore_id;
 
        if (unlikely(c >= NUM_CRYPTO || h >= NUM_HMAC))