net/txgbe: fix queue statistics mapping

[dpdk.git] / drivers / crypto / ipsec_mb / pmd_aesni_mb_priv.h

diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h
index db7d283..6ddfce2 100644 (file)
--- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h
@@ -275,6 +275,43 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {
                        }, }
                }, }
        },
+       {       /* NULL (AUTH) */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_NULL,
+                               .block_size = 1,
+                               .key_size = {
+                                       .min = 0,
+                                       .max = 0,
+                                       .increment = 0
+                               },
+                               .digest_size = {
+                                       .min = 0,
+                                       .max = 0,
+                                       .increment = 0
+                               },
+                               .iv_size = { 0 }
+                       }, },
+               }, },
+       },
+       {       /* NULL (CIPHER) */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_NULL,
+                               .block_size = 1,
+                               .key_size = {
+                                       .min = 0,
+                                       .max = 0,
+                                       .increment = 0
+                               },
+                               .iv_size = { 0 }
+                       }, },
+               }, }
+       },
        {       /* AES CBC */
                .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
                {.sym = {
@@ -526,8 +563,8 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {
                                .block_size = 16,
                                .key_size = {
                                        .min = 16,
-                                       .max = 16,
-                                       .increment = 0
+                                       .max = 32,
+                                       .increment = 16
                                },
                                .digest_size = {
                                        .min = 4,
@@ -536,8 +573,8 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {
                                },
                                .iv_size = {
                                        .min = 16,
-                                       .max = 16,
-                                       .increment = 0
+                                       .max = 25,
+                                       .increment = 9
                                }
                        }, }
                }, }
@@ -551,13 +588,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = {
                                .block_size = 16,
                                .key_size = {
                                        .min = 16,
-                                       .max = 16,
-                                       .increment = 0
+                                       .max = 32,
+                                       .increment = 16
                                },
                                .iv_size = {
                                        .min = 16,
-                                       .max = 16,
-                                       .increment = 0
+                                       .max = 25,
+                                       .increment = 9
                                },
                        }, }
                }, }
@@ -848,7 +885,7 @@ struct aesni_mb_session {
 
                        struct gcm_key_data gcm_key;
                        /* *< Expanded GCM key */
-                       uint8_t zuc_cipher_key[16];
+                       uint8_t zuc_cipher_key[32];
                        /* *< ZUC cipher key */
                        snow3g_key_schedule_t pKeySched_snow3g_cipher;
                        /* *< SNOW3G scheduled cipher key */
@@ -893,7 +930,7 @@ struct aesni_mb_session {
                                /* *< k3. */
                        } cmac;
                        /* *< Expanded XCBC authentication keys */
-                       uint8_t zuc_auth_key[16];
+                       uint8_t zuc_auth_key[32];
                        /* *< ZUC authentication key */
                        snow3g_key_schedule_t pKeySched_snow3g_auth;
                        /* *< SNOW3G scheduled authentication key */