From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2513DA0032 for ; Fri, 18 Feb 2022 13:44:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1DA6E40395; Fri, 18 Feb 2022 13:44:52 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id EDCB640141 for ; Fri, 18 Feb 2022 13:44:49 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id v12so14431236wrv.2 for ; Fri, 18 Feb 2022 04:44:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sEY6XuSmtnioDFiiOutH6l5f8YLW+XR5xE5VKCbnj5g=; b=BUafhkn+g6xawvog6IvAtLfJJnMKeomzWKALjsjIzYkTjxsVCSqIQZxhPaaXW6MEg2 xC+sp2IPlNyHP26yHJBpWOtPaxWIPSX52dfhxRY4HwSfLzfomVLxfA7AZU8K11IngHll t3h2IBJPGOPTnTo2TPm7RW70WI2qmsbLKI8iSCRxC7NXg4Zjb/WkhVbhvOEuCs/crDkU GaNphMUYSWSEMsdAwQ6WwDqoN55THQQ4+7h2XbDdNnUv7JyvYrwOX9+FAjjTHHespFVD AYCOFNqftJrKPEQHW/IPUf8s64RWJWb31akKBoCgFpeWqyGMT6d/tSWHuWBjCtxQIX1h IIBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sEY6XuSmtnioDFiiOutH6l5f8YLW+XR5xE5VKCbnj5g=; b=U1ms7dJc89UtVCfFrCubvTfTIBQc7W6DeOWjVgORnIxxJPJc5+JolUklOgER4okQ7t U2M0O1aV4tmy4lsRq3TL8LaZtoQJT99LyG3Aeq1kMNCEJG2iIC04Q59KYPIWCfTPMh8Z fOGqWFLa8Ez6MxDZt4On8952J7yDRIaArQp5AgQjKAHLYjMc3xMuc+FL8ejftRx4dOqS Fr6fUXC+bOCKT6Klp/MIA5JSVajoyR80zuJ5Do6m8cTYk2ARKC9gNv1dCl5ssd4hdy4f a76QKfAajHCfmCmoiYMfLtj5F2iz2llYQdRXduTp6D6v1CvmARUMR/vYSRhi82uOxxkH AHuA== X-Gm-Message-State: AOAM530WEHRWy2W38nDKukPYIfFGD1mcDoHYMJKRpL7G2YOdAFq7GjLo kN9DjYGoEUQWj325ORKA00W1sxos64aEWeO7 X-Google-Smtp-Source: ABdhPJxks5CUCWuPqKrVu1psD5SijazP1Kueb1eY5vt2/7qBlsK01IKSfdeXjYJ67tr1/oynQNvRoQ== X-Received: by 2002:a5d:5546:0:b0:1e7:39f7:92b9 with SMTP id g6-20020a5d5546000000b001e739f792b9mr5914611wrw.5.1645188289694; Fri, 18 Feb 2022 04:44:49 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id b18sm33816791wrx.92.2022.02.18.04.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:49 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Konstantin Ananyev , dpdk stable Subject: patch 'ipsec: fix C++ include' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:10 +0000 Message-Id: <20220218123931.1749595-101-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 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/20/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/97f298e315388b3b1f3c41119971777a666a3e5e Thanks. Luca Boccassi --- >From 97f298e315388b3b1f3c41119971777a666a3e5e Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:36 +0000 Subject: [PATCH] ipsec: fix C++ include [ upstream commit e82470e22528ad7c0277aa94ecbc6b97f3bdb4c2 ] C++ does not have automatic casting to/from void pointers, so need explicit cast if header is to be included in C++ code Fixes: f901d9c82688 ("ipsec: add helpers to group completed crypto-ops") Signed-off-by: Bruce Richardson Acked-by: Konstantin Ananyev --- lib/librte_ipsec/rte_ipsec_group.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/librte_ipsec/rte_ipsec_group.h index ea3bdfad95..530cd92eef 100644 --- a/lib/librte_ipsec/rte_ipsec_group.h +++ b/lib/librte_ipsec/rte_ipsec_group.h @@ -49,10 +49,10 @@ rte_ipsec_ses_from_crypto(const struct rte_crypto_op *cop) if (cop->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) { ss = cop->sym[0].sec_session; - return (void *)(uintptr_t)ss->opaque_data; + return (struct rte_ipsec_session *)(uintptr_t)ss->opaque_data; } else if (cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { cs = cop->sym[0].session; - return (void *)(uintptr_t)cs->opaque_data; + return (struct rte_ipsec_session *)(uintptr_t)cs->opaque_data; } return NULL; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.704939227 +0000 +++ 0101-ipsec-fix-C-include.patch 2022-02-18 12:37:37.834795136 +0000 @@ -1 +1 @@ -From e82470e22528ad7c0277aa94ecbc6b97f3bdb4c2 Mon Sep 17 00:00:00 2001 +From 97f298e315388b3b1f3c41119971777a666a3e5e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e82470e22528ad7c0277aa94ecbc6b97f3bdb4c2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/ipsec/rte_ipsec_group.h | 4 ++-- + lib/librte_ipsec/rte_ipsec_group.h | 4 ++-- @@ -18,4 +19,4 @@ -diff --git a/lib/ipsec/rte_ipsec_group.h b/lib/ipsec/rte_ipsec_group.h -index 60ab297710..62c2bd7217 100644 ---- a/lib/ipsec/rte_ipsec_group.h -+++ b/lib/ipsec/rte_ipsec_group.h +diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/librte_ipsec/rte_ipsec_group.h +index ea3bdfad95..530cd92eef 100644 +--- a/lib/librte_ipsec/rte_ipsec_group.h ++++ b/lib/librte_ipsec/rte_ipsec_group.h