X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=inline;f=examples%2Fdpdk_qat%2Fcrypto.c;h=8954bf876a400449754fe87c558f60288d60e29b;hb=6ba1f63b5ab0d6115c0fb74283e3a16512f56255;hp=318d47c09762dfa5796a32db088b190badf4bb7e;hpb=ea672a8b1655bbb44876d2550ff56f384968a43b;p=dpdk.git

diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c
index 318d47c097..8954bf876a 100644
--- 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
@@ -308,7 +307,7 @@ getCoreAffinity(Cpa32U *coreAffinity, const CpaInstanceHandle instanceHandle)
 	Cpa16U i = 0;
 	CpaStatus status = CPA_STATUS_SUCCESS;
 
-	bzero(&info, sizeof(CpaInstanceInfo2));
+	memset(&info, 0, sizeof(CpaInstanceInfo2));
 
 	status = cpaCyInstanceGetInfo2(instanceHandle, &info);
 	if (CPA_STATUS_SUCCESS != status) {
@@ -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;
@@ -381,7 +380,7 @@ initCySymSession(const int pkt_cipher_alg,
 	CpaBoolean isCrypto = CPA_TRUE, isHmac = CPA_TRUE;
 	CpaCySymSessionSetupData sessionSetupData;
 
-	bzero(&sessionSetupData, sizeof(CpaCySymSessionSetupData));
+	memset(&sessionSetupData, 0, sizeof(CpaCySymSessionSetupData));
 
 	/* Assumption: key length is set to each algorithm's max length */
 	switch (pkt_cipher_alg) {
@@ -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))
@@ -782,7 +781,7 @@ crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
 
 	lcore_id = rte_lcore_id();
 
-	bzero(opData, sizeof(CpaCySymDpOpData));
+	memset(opData, 0, sizeof(CpaCySymDpOpData));
 
 	opData->srcBuffer = opData->dstBuffer = PACKET_DATA_START_PHYS(rte_buff);
 	opData->srcBufferLen = opData->dstBufferLen = rte_buff->data_len;
@@ -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))
@@ -857,7 +856,7 @@ crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
 
 	lcore_id = rte_lcore_id();
 
-	bzero(opData, sizeof(CpaCySymDpOpData));
+	memset(opData, 0, sizeof(CpaCySymDpOpData));
 
 	opData->dstBuffer = opData->srcBuffer = PACKET_DATA_START_PHYS(rte_buff);
 	opData->dstBufferLen = opData->srcBufferLen = rte_buff->data_len;