From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 04340727A for ; Thu, 1 Feb 2018 10:49:37 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B0E262082E; Thu, 1 Feb 2018 04:49:36 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Thu, 01 Feb 2018 04:49:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=ERm/6l2nNdqjGFS7J wgthltRFlCC06v31QkQ6mlAa3Y=; b=THeFtGU0eqWWO2F4jK1LyNuS55ZP0vZns Klggh1E+dFlftVU08veOrweSsmB0+kIodYhueQltaHjCW0Nz7ELsd9XcG2u8ns6v FVqO7XSlvLuwnufuKMOfAD4EYrfDJ9yaPEre84pGRu3ro4JTJq5stuQ7nY68nQxL 7eT/4gh+O/NnI2dEUzsYDCItlmnU/7RD8rg8LdvokGoYPeu0JROklcHyabk9Flsp lRS/4tzEDhOufZ3XSbldK09teflb7sbAac2seEfnmbNvXiP5ynsEfjeqQBoLg/95 8ZYJgJnaE0ClfGlU1TzZwVdjc4COK+ut+IbQqMvf/gXHSvv+U5Mrw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=ERm/6l2nNdqjGFS7JwgthltRFlCC06v31QkQ6mlAa3Y=; b=gBhAuxs2 lrSoQi31KQ1JRnapN01oJMSavKSoaZW/lKafqSsk9PCkVvfpFbeqJcS42lbc1Xxo sFO8Brvk+jtzbzoTYQve8BzZYMCxSjh4laew9VYO5xkLXcUuhtfLNSLxKZ3JeRcC FVeS0q3rXeaInCrpMNHST2xoo03pa6OqCQx5P4pdyrFMa35K8DgjcmzwA3lECylO bx6Wmsax0f268xQPAiogYx5Z/ZkwLMQRWEBs7wZ+ypDX9IRij1bLLid2+D51OIam ELLBBzEvk6iTjzws0nc0Tc/M/kZYaegz0FOB4hfso8OenP/wqerg5CMOFJlX/7h3 4hcv01SDIPTEHg== X-ME-Sender: Received: from yliu-mob.mtl.com (unknown [115.150.27.200]) by mail.messagingengine.com (Postfix) with ESMTPA id 78F0024610; Thu, 1 Feb 2018 04:49:35 -0500 (EST) From: Yuanhan Liu To: Hemant Agrawal Cc: dpdk stable Date: Thu, 1 Feb 2018 17:47:50 +0800 Message-Id: <1517478479-12417-36-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517478479-12417-1-git-send-email-yliu@fridaylinux.org> References: <1517478479-12417-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'crypto/dpaa2_sec: fix enum conversion for GCM' has been queued to LTS release 17.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 09:49:37 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/03/18. So please shout if anyone has objections. Thanks. --yliu --- >>From cb524bc20ad44a078110ee7b52a32ec090e378a1 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Thu, 25 Jan 2018 15:23:29 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix enum conversion for GCM [ upstream commit 681271e85809f2c0c8c0b81433ec00c832661d15 ] dpaa2_sec/dpaa2_sec_dpseci.c:1287:25: error: implicit conversion from enumeration type 'enum rte_crypto_aead_algorithm' to different enumeration type 'enum rte_crypto_cipher_algorithm' [-Werror,-Wenum-conversion] session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM; Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR") Signed-off-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 9c64c5d..67fb6e2 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1309,7 +1309,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev, case RTE_CRYPTO_AEAD_AES_GCM: aeaddata.algtype = OP_ALG_ALGSEL_AES; aeaddata.algmode = OP_ALG_AAI_GCM; - session->cipher_alg = RTE_CRYPTO_AEAD_AES_GCM; + session->aead_alg = RTE_CRYPTO_AEAD_AES_GCM; break; case RTE_CRYPTO_AEAD_AES_CCM: RTE_LOG(ERR, PMD, "Crypto: Unsupported AEAD alg %u\n", diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h index 14e71df..8e58380 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h @@ -169,6 +169,7 @@ typedef struct dpaa2_sec_session_entry { uint8_t dir; /*!< Operation Direction */ enum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/ enum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/ + enum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/ union { struct { uint8_t *data; /**< pointer to key data */ -- 2.7.4