remove unused ring includes

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

diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c
index f49408a..02032f3 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>
@@ -54,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>
@@ -308,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) {
@@ -339,7 +337,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 +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) {
@@ -773,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))
@@ -782,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;
@@ -848,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))
@@ -857,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;