X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fdpdk_qat%2Fcrypto.c;h=c03ea78424e5dd079cd90657eef71f2eb2fa8c2c;hb=02a8686263dee7b1df98ec4f2fa2c24eca49f887;hp=318d47c09762dfa5796a32db088b190badf4bb7e;hpb=ea672a8b1655bbb44876d2550ff56f384968a43b;p=dpdk.git diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c index 318d47c097..c03ea78424 100644 --- a/examples/dpdk_qat/crypto.c +++ b/examples/dpdk_qat/crypto.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -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))