test/bonding: fix RSS test when disable RSS

[dpdk.git] / drivers / crypto / ipsec_mb / pmd_aesni_gcm.c

diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c b/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
index 2c20379..2c033c6 100644 (file)
--- a/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
@@ -96,7 +96,9 @@ aesni_gcm_session_configure(IMB_MGR *mb_mgr, void *session,
                sess->iv.length = auth_xform->auth.iv.length;
                key_length = auth_xform->auth.key.length;
                key = auth_xform->auth.key.data;
-               sess->req_digest_length = auth_xform->auth.digest_length;
+               sess->req_digest_length =
+                   RTE_MIN(auth_xform->auth.digest_length,
+                               DIGEST_LENGTH_MAX);
                break;
        case IPSEC_MB_OP_AEAD_AUTHENTICATED_ENCRYPT:
        case IPSEC_MB_OP_AEAD_AUTHENTICATED_DECRYPT:
@@ -116,7 +118,9 @@ aesni_gcm_session_configure(IMB_MGR *mb_mgr, void *session,
                key_length = aead_xform->aead.key.length;
                key = aead_xform->aead.key.data;
                sess->aad_length = aead_xform->aead.aad_length;
-               sess->req_digest_length = aead_xform->aead.digest_length;
+               sess->req_digest_length =
+                       RTE_MIN(aead_xform->aead.digest_length,
+                               DIGEST_LENGTH_MAX);
                break;
        default:
                IPSEC_MB_LOG(
@@ -713,19 +717,17 @@ aesni_gcm_process_bulk(struct rte_cryptodev *dev,
                        __rte_unused union rte_crypto_sym_ofs ofs,
                        struct rte_crypto_sym_vec *vec)
 {
-       void *sess_priv;
        struct aesni_gcm_session *s;
        struct gcm_context_data gdata_ctx;
        IMB_MGR *mb_mgr;
 
-       sess_priv = get_sym_session_private_data(sess, dev->driver_id);
-       if (unlikely(sess_priv == NULL)) {
+       s = (struct aesni_gcm_session *) get_sym_session_private_data(sess,
+               dev->driver_id);
+       if (unlikely(s == NULL)) {
                aesni_gcm_fill_error_code(vec, EINVAL);
                return 0;
        }
 
-       s = sess_priv;
-
        /* get per-thread MB MGR, create one if needed */
        mb_mgr = get_per_thread_mb_mgr();
        if (unlikely(mb_mgr == NULL))