crypto: fix build with icc

This commit fixes a compilation error on icc,
due to unallowed conversion from int to enum:

drivers/crypto/snow3g/rte_snow3g_pmd.c(155):
    error #188: enumerated type mixed with another type
        sess->op = mode;
                 ^
drivers/crypto/kasumi/rte_kasumi_pmd.c(155):
    error #188: enumerated type mixed with another type
        sess->op = mode;
                 ^

Fixes: 3aafc423cf4d ("snow3g: add driver for SNOW 3G library")
Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library")
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 8774fc23060bebe8a52570a85fbed5fee2bb4b1c..03e7272391e1976cdae8a80c69cf0d0436ec770c 100644 (file)
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -108,7 +108,7 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
 {
        const struct rte_crypto_sym_xform *auth_xform = NULL;
        const struct rte_crypto_sym_xform *cipher_xform = NULL;
-       int mode;
+       enum kasumi_operation mode;
 
        /* Select Crypto operation - hash then cipher / cipher then hash */
        mode = kasumi_get_mode(xform);
@@ -125,9 +125,9 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
                /* Fall-through */
        case KASUMI_OP_ONLY_AUTH:
                auth_xform = xform;
-       }
-
-       if (mode == KASUMI_OP_NOT_SUPPORTED) {
+               break;
+       case KASUMI_OP_NOT_SUPPORTED:
+       default:
                KASUMI_LOG_ERR("Unsupported operation chain order parameter");
                return -EINVAL;
        }

diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index e64d7a7ee169a74e5fba6d7349ec776b1c03746a..60d896901ad8d50c6684ee04ae41f5800fa30c75 100644 (file)
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -107,7 +107,7 @@ snow3g_set_session_parameters(struct snow3g_session *sess,
 {
        const struct rte_crypto_sym_xform *auth_xform = NULL;
        const struct rte_crypto_sym_xform *cipher_xform = NULL;
-       int mode;
+       enum snow3g_operation mode;
 
        /* Select Crypto operation - hash then cipher / cipher then hash */
        mode = snow3g_get_mode(xform);
@@ -125,9 +125,9 @@ snow3g_set_session_parameters(struct snow3g_session *sess,
                /* Fall-through */
        case SNOW3G_OP_ONLY_AUTH:
                auth_xform = xform;
-       }
-
-       if (mode == SNOW3G_OP_NOT_SUPPORTED) {
+               break;
+       case SNOW3G_OP_NOT_SUPPORTED:
+       default:
                SNOW3G_LOG_ERR("Unsupported operation chain order parameter");
                return -EINVAL;
        }