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 28A38A034C for ; Fri, 25 Feb 2022 18:18:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23A9C41156; Fri, 25 Feb 2022 18:18:00 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 54F6E41148 for ; Fri, 25 Feb 2022 18:17:58 +0100 (CET) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id F33FB3FCAB for ; Fri, 25 Feb 2022 17:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809477; bh=Hks36QhBF7vcaUbm8Hu0aaVFiCBe0BUlVFcJF3Xtu4c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lxavLLBCQtsuXJp7Nm4A4x6rMUzpjPAsu9WZbbuiLa6u2FNmIM57FE0kEd3wCC0n0 YT+0tGCsZ0v6FR4rx3gJlsdbnB0BvxU5xsc2z7dESXBTZKpYthe3bgFYpatAwAVSCW m7UE979zv/6v/t2ZQI93s7cq6PD9DY39CJwCQSc8p68k7lTPcpFLesj6avFqne7cfh t0sLVd3KeRL6+LhcwLnm83WwwRKrCLiuZpBS2Xtws01pJs4qelFnho9zxUxyqBxTPc 201gN8gvPNuEREQMTtmXduYwvhQccv7Tu4ynUCY/MdGCExrfIBFOlTiknoXSosv1FQ JeEdYm9IDH8YA== Received: by mail-wr1-f71.google.com with SMTP id g15-20020adfbc8f000000b001e9506e27ddso1089291wrh.22 for ; Fri, 25 Feb 2022 09:17:57 -0800 (PST) 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=Hks36QhBF7vcaUbm8Hu0aaVFiCBe0BUlVFcJF3Xtu4c=; b=b6muCw6rtq8dWm231apbIMbKNbEudrvMQ/+DttLcbcTaBHOj+Z0EeqPmASpa85X/H9 afMwT72MBoeDwTTv1H5XZDatlpsWaXEgqlEDJCuQ0GsrgqbvdZslv3d24zFybQMIVgz3 4gCufFN1LwonrMBCT+2pez9p0obLAPsC299GA6ktl2qr5bbjCuSos5hhYucZknQDHcmf uIJCYg+EFbcbBNGZ/NsS3ygnG5MuBYtZZncDhOtru9TYsC6RnLtkC2rVe1bUABvs55ju rab/yuXloR2pgvnwnqa0Dcdimirnji/iLblpJl/9YmlgG6qw9t7ug6/L9ODrV5p0YrhI eUBg== X-Gm-Message-State: AOAM531/qEuardHD0JMoQheVvSe0lYF0LFml+M6jWje4NcKaB4pMjwce bQDeL5Lygp1MKTUELM5R7Vx9W5QEoP3v4vRjf7L5IlHMPkOECibDJVoM6rvalNiRHnbl9IatgPx tk4gPS1MUdh7z9jo6no31FTzE X-Received: by 2002:a5d:64aa:0:b0:1e8:59c0:93c3 with SMTP id m10-20020a5d64aa000000b001e859c093c3mr6911693wrp.173.1645809477259; Fri, 25 Feb 2022 09:17:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMApzvO1CLtUWQvrqBjgErUpo6GALFdOva92u61AQOu1bOJlp4kUBwif57mPvdXuJHf5CXYQ== X-Received: by 2002:a5d:64aa:0:b0:1e8:59c0:93c3 with SMTP id m10-20020a5d64aa000000b001e859c093c3mr6911680wrp.173.1645809477006; Fri, 25 Feb 2022 09:17:57 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id p18-20020adfba92000000b001e4ae791663sm2899611wrg.62.2022.02.25.09.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:56 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: Konstantin Ananyev , dpdk stable Subject: patch 'ipsec: fix C++ include' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:38 +0100 Message-Id: <20220225171550.3499040-45-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/adda8aa04b5e98694121ca763d6a98fd75c44488 Thanks. Christian Ehrhardt --- >From adda8aa04b5e98694121ca763d6a98fd75c44488 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 47b33ca5ec..27a2f6f26d 100644 --- a/lib/librte_ipsec/rte_ipsec_group.h +++ b/lib/librte_ipsec/rte_ipsec_group.h @@ -51,10 +51,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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.977174059 +0100 +++ 0045-ipsec-fix-C-include.patch 2022-02-25 16:58:44.288990455 +0100 @@ -1 +1 @@ -From e82470e22528ad7c0277aa94ecbc6b97f3bdb4c2 Mon Sep 17 00:00:00 2001 +From adda8aa04b5e98694121ca763d6a98fd75c44488 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,5 +19,5 @@ -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 -@@ -49,10 +49,10 @@ rte_ipsec_ses_from_crypto(const struct rte_crypto_op *cop) +diff --git a/lib/librte_ipsec/rte_ipsec_group.h b/lib/librte_ipsec/rte_ipsec_group.h +index 47b33ca5ec..27a2f6f26d 100644 +--- a/lib/librte_ipsec/rte_ipsec_group.h ++++ b/lib/librte_ipsec/rte_ipsec_group.h +@@ -51,10 +51,10 @@ rte_ipsec_ses_from_crypto(const struct rte_crypto_op *cop)