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 6D490A0093 for ; Wed, 9 Mar 2022 12:02:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68E5E40150; Wed, 9 Mar 2022 12:02:02 +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 5212940150 for ; Wed, 9 Mar 2022 12:02:01 +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 314B33F1C5 for ; Wed, 9 Mar 2022 11:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823720; bh=vHrhXozSfCMieYsd+QpqUeiejigCR04TIHpcwMEtuNA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YKzOrJDA8rD+0ZPUheradHGhj+SIDy3EVdCZg/jQHtKtldxA8a+748JNFtWF5wAmE Cd49tBZy5rfsecBzaLJFKr214p4qwBTuJBHq9rBnr9y9znttm8JjMpceiyNX4/5PVC cjV4SmZM090THiTPpk2wywwJ2qQInyQ/Klc5A5t8GvV2Q/quiH+aZxt/BAsNIX9K/x UiPpSwzNDa3WkkPsV65iURtobcD6KTd89OgDjql9XfJ7ESe/wL3xGP1QEgUAFvgOt8 do1bwMh3wW8F74Lc/cgAEqjtzUzFpLq5YTgFdJGIr2A2MjHdLdL4g08VKl73Sn8a6e 5FWuemktgYuBw== Received: by mail-wr1-f71.google.com with SMTP id w17-20020adfec51000000b001f068bc3342so638726wrn.6 for ; Wed, 09 Mar 2022 03:02:00 -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=vHrhXozSfCMieYsd+QpqUeiejigCR04TIHpcwMEtuNA=; b=0nts/sUI/pX6bjCDp2BhkFK/rhXH7Ky2sdZeUl/WiyEnhuaoQqR1kB2V13+HBC9aTT hnHuf6Prh7OErHTYd7A7f9QfUjdCsUUD2P+ucuaTs9Q9jfCl95MqLkGwh41vf5TnHZkr rUzoQPfoOCTy5cOtPt4sBRVGXJvveInGyb0SoiHSyuMokk6OFCx1y6WCMYW1t+6ZhIFj A4bwJDQ+LN/X+cHSvX1uN1HP+jmsS21yJjvXQT+klloMRosHblwJKdlz1k0aUVHFCDBF onb8aOuIWyM0LoTfNFDLCtXrZYcA9R3lwkDKwWmIse9JtsvsaYGXIv65nUi2Z8R71VCo TeOw== X-Gm-Message-State: AOAM53334kyovGSDik5aSX7FEf0uOm//s+AJfgWgv/bO1OleGfQ6omLK 2vhcYRYYFeV7Iamf8dhYAaKybMxlMCw62oxaMAFtNwNmJZmf3CSH9OMnZboyHkiLoEM0IbH3Wmo H84WoPIs0LTR4n4UYRPRbzndn X-Received: by 2002:a5d:4cd1:0:b0:1f0:24d5:7c37 with SMTP id c17-20020a5d4cd1000000b001f024d57c37mr15682250wrt.421.1646823714087; Wed, 09 Mar 2022 03:01:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2cRMuR5k+wQk4QiZDVRmytVngOpHBzztm/HOQkW9FjIYA9Q27QKjhHozkNtwWBim2y3hWHg== X-Received: by 2002:a5d:4cd1:0:b0:1f0:24d5:7c37 with SMTP id c17-20020a5d4cd1000000b001f024d57c37mr15682239wrt.421.1646823713886; Wed, 09 Mar 2022 03:01:53 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id v14-20020adfd18e000000b0020373e5319asm1467247wrc.103.2022.03.09.03.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:01:53 -0800 (PST) From: christian.ehrhardt@canonical.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'kni: add missing C++ guards' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:37 +0100 Message-Id: <20220309110116.1295395-6-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-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 03/11/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/cf53c731767ca510f3fa7451753f694584963986 Thanks. Christian Ehrhardt --- >From cf53c731767ca510f3fa7451753f694584963986 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:53 +0000 Subject: [PATCH] kni: add missing C++ guards [ upstream commit e90df35c7a0328f7ad5bfc4d2d9968ff774d7f77 ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: 3fc5ca2f6352 ("kni: initial import") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/librte_eal/linux/eal/include/rte_kni_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h index 7313ef504e..cfbba2a704 100644 --- a/lib/librte_eal/linux/eal/include/rte_kni_common.h +++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h @@ -6,6 +6,10 @@ #ifndef _RTE_KNI_COMMON_H_ #define _RTE_KNI_COMMON_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifdef __KERNEL__ #include #include @@ -134,4 +138,8 @@ struct rte_kni_device_info { #define RTE_KNI_IOCTL_CREATE _IOWR(0, 2, struct rte_kni_device_info) #define RTE_KNI_IOCTL_RELEASE _IOWR(0, 3, struct rte_kni_device_info) +#ifdef __cplusplus +} +#endif + #endif /* _RTE_KNI_COMMON_H_ */ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:43.714371219 +0100 +++ 0006-kni-add-missing-C-guards.patch 2022-03-09 11:57:43.320937928 +0100 @@ -1 +1 @@ -From e90df35c7a0328f7ad5bfc4d2d9968ff774d7f77 Mon Sep 17 00:00:00 2001 +From cf53c731767ca510f3fa7451753f694584963986 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e90df35c7a0328f7ad5bfc4d2d9968ff774d7f77 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/kni/rte_kni_common.h | 8 ++++++++ + lib/librte_eal/linux/eal/include/rte_kni_common.h | 8 ++++++++ @@ -19,4 +20,4 @@ -diff --git a/lib/kni/rte_kni_common.h b/lib/kni/rte_kni_common.h -index b547ea5501..8d3ee0fa4f 100644 ---- a/lib/kni/rte_kni_common.h -+++ b/lib/kni/rte_kni_common.h +diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h +index 7313ef504e..cfbba2a704 100644 +--- a/lib/librte_eal/linux/eal/include/rte_kni_common.h ++++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h @@ -34 +35 @@ -@@ -136,4 +140,8 @@ struct rte_kni_device_info { +@@ -134,4 +138,8 @@ struct rte_kni_device_info {