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 E3BA0A034F for ; Tue, 1 Mar 2022 11:43:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE003426DD; Tue, 1 Mar 2022 11:43:32 +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 CC30F407FF for ; Tue, 1 Mar 2022 11:43:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131411; 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=+Xpdi9/NPKqfrihH5XbtpT4vqUH8aoj01ZXyGK4gezM=; b=I45GaRbVHrRvNBvBJrcR0zp9rdRo/fpnMKaE7NOlF/L4puil3RSv2Wq6bCAQyLZkyv2ehV DDCSvfPG5NFF5PTBR7q3rgSZl4YxauNDJfR7gyRHDHbdbdGvHGzREODGvRmoPvUFxQZsv1 8TbLJ4q7QQQohqj8o8gKLuv1QwY4/HM= 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-261-Oz5PR9RYMCWa3p3IKKTt0w-1; Tue, 01 Mar 2022 05:43:28 -0500 X-MC-Unique: Oz5PR9RYMCWa3p3IKKTt0w-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 957FA801AB2; Tue, 1 Mar 2022 10:43:27 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DC9E752D2; Tue, 1 Mar 2022 10:43:25 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'kni: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:25 +0000 Message-Id: <20220301104300.334382-9-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/fb37e2b3ae1f559296ea780e340a3599a65e9b9f Thanks. Kevin --- >From fb37e2b3ae1f559296ea780e340a3599a65e9b9f 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/kni/rte_kni_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) 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 @@ -7,4 +7,8 @@ #define _RTE_KNI_COMMON_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifdef __KERNEL__ #include @@ -137,3 +141,7 @@ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.687024700 +0000 +++ 0009-kni-add-missing-C-guards.patch 2022-03-01 10:41:01.245244086 +0000 @@ -1 +1 @@ -From e90df35c7a0328f7ad5bfc4d2d9968ff774d7f77 Mon Sep 17 00:00:00 2001 +From fb37e2b3ae1f559296ea780e340a3599a65e9b9f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e90df35c7a0328f7ad5bfc4d2d9968ff774d7f77 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org