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 9E00AA0350 for ; Mon, 21 Feb 2022 16:41:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DD9E4013F; Mon, 21 Feb 2022 16:41:49 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C6822410F7 for ; Mon, 21 Feb 2022 16:41:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xWMUfe4K9sSjW5pftPkJ9Jg1BlTDhvpC0tyrjhCk9DM=; b=F+9yRWvMgHlCxxX9kA2O8+/15j9Z2kGgAaZcg1GM+WH5XcuOlLJRPqDL6IfX9d3tRtjBHj sBFLZnZiR1Pz/R2/Kbd/UH+nACPh+t0vJAvINA+6bflmaIYYGo3vLes9Fex8ezjUw0SODI m5HTypwlpLk1RQsWom4vlQPTpeltUAY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-410-Kldj3lNsMpy2ePf8REP5Qg-1; Mon, 21 Feb 2022 10:41:43 -0500 X-MC-Unique: Kldj3lNsMpy2ePf8REP5Qg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B076D100C660; Mon, 21 Feb 2022 15:41:42 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id A55117E2E8; Mon, 21 Feb 2022 15:41:41 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Konstantin Ananyev , dpdk stable Subject: patch 'ipsec: fix C++ include' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:40 +0000 Message-Id: <20220221153625.152324-151-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/91b9d6cd34aba0db5ddbee1fbf17682d4b3f95d6 Thanks. Kevin --- >From 91b9d6cd34aba0db5ddbee1fbf17682d4b3f95d6 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/ipsec/rte_ipsec_group.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ -50,8 +50,8 @@ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.848502228 +0000 +++ 0151-ipsec-fix-C-include.patch 2022-02-21 15:22:44.303704603 +0000 @@ -1 +1 @@ -From e82470e22528ad7c0277aa94ecbc6b97f3bdb4c2 Mon Sep 17 00:00:00 2001 +From 91b9d6cd34aba0db5ddbee1fbf17682d4b3f95d6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e82470e22528ad7c0277aa94ecbc6b97f3bdb4c2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org