From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5D454A04A3 for ; Fri, 5 Jun 2020 20:26:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0FD6F1D533; Fri, 5 Jun 2020 20:26:59 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id EF5151D528 for ; Fri, 5 Jun 2020 20:26:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381617; 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=hlZs6UciHepC3U9KaYEfz0rC/LrKeNkK9FQzFg9IM/s=; b=AVsOw2Wvuk57YNSPJs3sYrn673PB2bTkdhp5KI/iGTKZGAoDqbc6ipQPVG8F7Bc8ZKOzAA +71ZMk3Cax7oBdr98joo4WVSlmSt+FzRu5xrLFF/r3hVOA3S4s4bv1EUvo0u+4PVK49MTA ShR9Lv4q6VCNFCU1t8547W8pf2bqrsI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-491-spBYaWZ3PGWmeuoMjBxvYg-1; Fri, 05 Jun 2020 14:26:54 -0400 X-MC-Unique: spBYaWZ3PGWmeuoMjBxvYg-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 EBB1C835B8F; Fri, 5 Jun 2020 18:26:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1396760C47; Fri, 5 Jun 2020 18:26:47 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: Pablo de Lara , dpdk stable Date: Fri, 5 Jun 2020 19:24:28 +0100 Message-Id: <20200605182525.22483-31-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/kasumi: fix extern declaration' has been queued to LTS release 18.11.9 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/33e94066f7dc9c40ed16f5b6eca7d862251afa19 Thanks. Kevin. --- >From 33e94066f7dc9c40ed16f5b6eca7d862251afa19 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Wed, 6 May 2020 10:45:18 +0100 Subject: [PATCH] crypto/kasumi: fix extern declaration [ upstream commit 6a6b5d5616c976eb306cbdbcf9241aba08d2516e ] gcc 10 defaults to fno-common and it reports: crypto_kasumi_rte_kasumi_pmd_ops.c.o:(.data.rel+0x0): multiple definition of `rte_kasumi_pmd_ops'; crypto_kasumi_rte_kasumi_pmd.c.o:(.bss+0x8): first defined here Fix by making rte_kasumi_pmd_ops extern in the header file. Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library") Signed-off-by: Kevin Traynor Acked-by: Pablo de Lara --- drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h index bb34a16f7c..d26a86b62c 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h +++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h @@ -71,5 +71,5 @@ kasumi_set_session_parameters(struct kasumi_session *sess, /** device specific operations function pointer structure */ -struct rte_cryptodev_ops *rte_kasumi_pmd_ops; +extern struct rte_cryptodev_ops *rte_kasumi_pmd_ops; #endif /* _RTE_KASUMI_PMD_PRIVATE_H_ */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:52.565156799 +0100 +++ 0031-crypto-kasumi-fix-extern-declaration.patch 2020-06-05 19:20:50.758041995 +0100 @@ -1 +1 @@ -From 6a6b5d5616c976eb306cbdbcf9241aba08d2516e Mon Sep 17 00:00:00 2001 +From 33e94066f7dc9c40ed16f5b6eca7d862251afa19 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6a6b5d5616c976eb306cbdbcf9241aba08d2516e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ - drivers/crypto/kasumi/kasumi_pmd_private.h | 2 +- + drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +- @@ -23,5 +24,5 @@ -diff --git a/drivers/crypto/kasumi/kasumi_pmd_private.h b/drivers/crypto/kasumi/kasumi_pmd_private.h -index b7f1c428b4..abedcd616d 100644 ---- a/drivers/crypto/kasumi/kasumi_pmd_private.h -+++ b/drivers/crypto/kasumi/kasumi_pmd_private.h -@@ -77,5 +77,5 @@ kasumi_set_session_parameters(MB_MGR *mgr, struct kasumi_session *sess, +diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h +index bb34a16f7c..d26a86b62c 100644 +--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h ++++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h +@@ -71,5 +71,5 @@ kasumi_set_session_parameters(struct kasumi_session *sess, @@ -33 +34 @@ - #endif /* _KASUMI_PMD_PRIVATE_H_ */ + #endif /* _RTE_KASUMI_PMD_PRIVATE_H_ */