crypto/qat: fix ambiguous variable names for CRC
authorDavid Coyle <david.coyle@intel.com>
Thu, 16 Jul 2020 15:34:36 +0000 (16:34 +0100)
committerAkhil Goyal <akhil.goyal@nxp.com>
Sat, 18 Jul 2020 21:30:47 +0000 (23:30 +0200)
The variable names crc_length and crc_offset have been changed to
crc_data_len and crc_data_ofs respectively, to make it clearer as to
their use i.e. the length and offset of the data over which the CRC is
calculated.

Fixes: 6f0ef237404b ("crypto/qat: support DOCSIS protocol")

Signed-off-by: David Coyle <david.coyle@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
drivers/crypto/qat/qat_sym.c
drivers/crypto/qat/qat_sym.h

index 632313a..e6bf115 100644 (file)
@@ -108,18 +108,18 @@ qat_crc_generate(struct qat_sym_session *ctx,
                        struct rte_crypto_op *op)
 {
        struct rte_crypto_sym_op *sym_op = op->sym;
-       uint32_t *crc, crc_length;
+       uint32_t *crc, crc_data_len;
        uint8_t *crc_data;
 
        if (ctx->qat_dir == ICP_QAT_HW_CIPHER_ENCRYPT &&
                        sym_op->auth.data.length != 0) {
 
-               crc_length = sym_op->auth.data.length;
+               crc_data_len = sym_op->auth.data.length;
                crc_data = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *,
                                sym_op->auth.data.offset);
-               crc = (uint32_t *)(crc_data + crc_length);
+               crc = (uint32_t *)(crc_data + crc_data_len);
 
-               *crc = rte_net_crc_calc(crc_data, crc_length,
+               *crc = rte_net_crc_calc(crc_data, crc_data_len,
                                RTE_NET_CRC32_ETH);
        }
 }
index dbca74e..7934dd4 100644 (file)
@@ -140,20 +140,21 @@ static inline void
 qat_crc_verify(struct qat_sym_session *ctx, struct rte_crypto_op *op)
 {
        struct rte_crypto_sym_op *sym_op = op->sym;
-       uint32_t crc_offset, crc_length, crc;
+       uint32_t crc_data_ofs, crc_data_len, crc;
        uint8_t *crc_data;
 
        if (ctx->qat_dir == ICP_QAT_HW_CIPHER_DECRYPT &&
                        sym_op->auth.data.length != 0) {
 
-               crc_offset = sym_op->auth.data.offset;
-               crc_length = sym_op->auth.data.length;
+               crc_data_ofs = sym_op->auth.data.offset;
+               crc_data_len = sym_op->auth.data.length;
                crc_data = rte_pktmbuf_mtod_offset(sym_op->m_src, uint8_t *,
-                               crc_offset);
+                               crc_data_ofs);
 
-               crc = rte_net_crc_calc(crc_data, crc_length, RTE_NET_CRC32_ETH);
+               crc = rte_net_crc_calc(crc_data, crc_data_len,
+                               RTE_NET_CRC32_ETH);
 
-               if (crc != *(uint32_t *)(crc_data + crc_length))
+               if (crc != *(uint32_t *)(crc_data + crc_data_len))
                        op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
        }
 }