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 3D05EA034F for ; Tue, 1 Mar 2022 11:43:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AADC426E1; Tue, 1 Mar 2022 11:43:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 90820426DA for ; Tue, 1 Mar 2022 11:43:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131404; 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=tGO87rpX6CUXshguv2+PoaKgR+u5G+09tbB2tLk8xys=; b=WxLYaovMej7Fuaj+Y6NQsbYW34xip1DTbVtD2nSrLHZOhoU/xlvhlEg3zql1IN2SMgfSbe 3MjulCG4yTHSvgpw82pNjgMDWKgQcqjltR9EKINWwgXToD5RXoDos2cCagG0StWSoQIUsk xQpj3QGbYqLCudOSkgSJyc456UOx6Zk= 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-115-bnFvAQURPPy-IMqSM5-BKg-1; Tue, 01 Mar 2022 05:43:19 -0500 X-MC-Unique: bnFvAQURPPy-IMqSM5-BKg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2EDE1100C610; Tue, 1 Mar 2022 10:43:18 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id D906A752BE; Tue, 1 Mar 2022 10:43:16 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'ethdev: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:20 +0000 Message-Id: <20220301104300.334382-4-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 03/06/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/b99a45df054af0cb5b847e7d9b87bf95c2e345d4 Thanks. Kevin --- >From b99a45df054af0cb5b847e7d9b87bf95c2e345d4 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:48 +0000 Subject: [PATCH] ethdev: add missing C++ guards [ upstream commit dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: 7a3f27cbf59b ("ethdev: add access to specific device info") Fixes: dcd5c8112bc3 ("ethdev: add PCI driver helpers") Fixes: 7f0a669e7b04 ("ethdev: add allocation helper for virtual drivers") Fixes: 7a3357205755 ("lib: remove C++ include guard from private headers") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/ethdev/ethdev_driver.h | 8 ++++++++ lib/ethdev/ethdev_pci.h | 8 ++++++++ lib/ethdev/ethdev_vdev.h | 8 ++++++++ lib/ethdev/rte_dev_info.h | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 0dac55f9c8..2822fd8c72 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -6,4 +6,8 @@ #define _RTE_ETHDEV_DRIVER_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * @file @@ -1769,3 +1773,7 @@ struct rte_eth_tunnel_filter_conf { }; +#ifdef __cplusplus +} +#endif + #endif /* _RTE_ETHDEV_DRIVER_H_ */ diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h index 71aa4b2e98..6130bcbd1f 100644 --- a/lib/ethdev/ethdev_pci.h +++ b/lib/ethdev/ethdev_pci.h @@ -7,4 +7,8 @@ #define _RTE_ETHDEV_PCI_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -172,3 +176,7 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev, } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_ETHDEV_PCI_H_ */ diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h index 2b49e9665b..f5f536ce64 100644 --- a/lib/ethdev/ethdev_vdev.h +++ b/lib/ethdev/ethdev_vdev.h @@ -7,4 +7,8 @@ #define _RTE_ETHDEV_VDEV_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -53,3 +57,7 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size) } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_ETHDEV_VDEV_H_ */ diff --git a/lib/ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h index cb2fe0ae97..67cf0ae526 100644 --- a/lib/ethdev/rte_dev_info.h +++ b/lib/ethdev/rte_dev_info.h @@ -6,4 +6,8 @@ #define _RTE_DEV_INFO_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include @@ -49,3 +53,7 @@ struct rte_eth_dev_module_info { #define RTE_ETH_MODULE_SFF_8436_MAX_LEN 640 +#ifdef __cplusplus +} +#endif + #endif /* _RTE_DEV_INFO_H_ */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.574860994 +0000 +++ 0004-ethdev-add-missing-C-guards.patch 2022-03-01 10:41:01.241244085 +0000 @@ -1 +1 @@ -From dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e Mon Sep 17 00:00:00 2001 +From b99a45df054af0cb5b847e7d9b87bf95c2e345d4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 6d697a879a..5ec00e533e 100644 +index 0dac55f9c8..2822fd8c72 100644 @@ -38 +39 @@ -@@ -1882,3 +1886,7 @@ struct rte_eth_tunnel_filter_conf { +@@ -1769,3 +1773,7 @@ struct rte_eth_tunnel_filter_conf {