X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=examples%2Fdpdk_qat%2Fcrypto.c;h=02032f30b7301b118e59fad2b54ce2297372730b;hb=9dad5b9e892e5f7770a7b5992a523f8c6053ae79;hp=00e0eb5b147e8cad32ca0372aaff0b3be54211b5;hpb=ff708facfcbf42f3dcb3c62d82ecd93e7b8c2506;p=dpdk.git

diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c
index 00e0eb5b14..02032f30b7 100644
--- a/examples/dpdk_qat/crypto.c
+++ b/examples/dpdk_qat/crypto.c
@@ -53,7 +53,6 @@
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
@@ -307,7 +306,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) {
@@ -380,7 +379,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) {
@@ -772,8 +771,8 @@ enum crypto_result
 crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
 {
 	CpaCySymDpOpData *opData =
-			(CpaCySymDpOpData *) (rte_pktmbuf_mtod(rte_buff, char *)
-					+ 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))
@@ -781,7 +780,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;
@@ -847,8 +846,8 @@ enum crypto_result
 crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h)
 {
 
-	CpaCySymDpOpData *opData = (void*) (rte_pktmbuf_mtod(rte_buff, char *)
-			+ 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))
@@ -856,7 +855,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;