* [dpdk-dev] [PATCH] crypto: fix build with icc
@ 2016-09-28 0:31 Pablo de Lara
2016-09-28 15:58 ` Ferruh Yigit
0 siblings, 1 reply; 3+ messages in thread
From: Pablo de Lara @ 2016-09-28 0:31 UTC (permalink / raw)
To: dev; +Cc: declan.doherty, Pablo de Lara
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>
---
drivers/crypto/kasumi/rte_kasumi_pmd.c | 8 ++++----
drivers/crypto/snow3g/rte_snow3g_pmd.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 4e21743..df1eb52 100644
--- 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 369c14a..c02e6e6 100644
--- 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;
}
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] crypto: fix build with icc
2016-09-28 0:31 [dpdk-dev] [PATCH] crypto: fix build with icc Pablo de Lara
@ 2016-09-28 15:58 ` Ferruh Yigit
2016-09-29 1:23 ` De Lara Guarch, Pablo
0 siblings, 1 reply; 3+ messages in thread
From: Ferruh Yigit @ 2016-09-28 15:58 UTC (permalink / raw)
To: Pablo de Lara, dev; +Cc: declan.doherty
On 9/28/2016 1:31 AM, Pablo de Lara wrote:
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] crypto: fix build with icc
2016-09-28 15:58 ` Ferruh Yigit
@ 2016-09-29 1:23 ` De Lara Guarch, Pablo
0 siblings, 0 replies; 3+ messages in thread
From: De Lara Guarch, Pablo @ 2016-09-29 1:23 UTC (permalink / raw)
To: Yigit, Ferruh, dev; +Cc: Doherty, Declan
> -----Original Message-----
> From: Yigit, Ferruh
> Sent: Wednesday, September 28, 2016 8:59 AM
> To: De Lara Guarch, Pablo; dev@dpdk.org
> Cc: Doherty, Declan
> Subject: Re: [dpdk-dev] [PATCH] crypto: fix build with icc
>
> On 9/28/2016 1:31 AM, Pablo de Lara wrote:
> > 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>
Applied to dpdk-next-crypto.
Pablo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-29 1:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-28 0:31 [dpdk-dev] [PATCH] crypto: fix build with icc Pablo de Lara
2016-09-28 15:58 ` Ferruh Yigit
2016-09-29 1:23 ` De Lara Guarch, Pablo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).