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 95BECA0353 for ; Mon, 28 Feb 2022 22:21:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90F14411CB; Mon, 28 Feb 2022 22:21:11 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 1B5C9411B8 for ; Mon, 28 Feb 2022 22:21:10 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id p9so17401534wra.12 for ; Mon, 28 Feb 2022 13:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c9yrZ9ijxqoRRCtSWbEZllPw7eT0e/2nur3sjpph2+w=; b=FJcAi6BP+ObcxwX3bQiXO7lneXZk0pRxESd/F/FV194juvlelNOJ9ikCg9Zp/ETT8u oHb92OozsgQazBm4CHvw0oSEJDuyDPack8/HAeQiBUjX+bT63FDdWJFqcdFUBypLZ2Vz g5ZukUuBt+0A4AKtGYoKOTUocoj7vIZkWl2rvcUBg9XjJ8i3ddU/tfggpqlzdd7JLsvM 7lUbo7b+tviNFmhhciZQY5OJVz1qpZvOnO8GAwadfvb+97r9v+cFvzB2ly4/g4dvtj/J TKpEurYQ86a2MkrMQkCHL5+q8KYL0WNvwlkA+eGkMtiIIhO4eQOZEisnXS1zYDO7plGQ L3jg== 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=c9yrZ9ijxqoRRCtSWbEZllPw7eT0e/2nur3sjpph2+w=; b=Pd5NcKCYWsCVTozQWAR2AvfyHYLms3LaIrtBMXjoJHGMp+/z91Wfiv2IU5gZvQbozb 1xj6de19oXscFXlSSgkxs+lJYScVIgAhfXt3ur9NQTjrpmXvW0kpFOjDeoiE8bF9atYe d5YB2+6oFTcHNxdChLh9CMnnoxdrPjerdemAccjeLPFU0+FUBvuSZZGQeCPs4v+RtSVd je9k4cN5ffA8ovY+2bk5cqMXDn0M6Tc7FfYCsIPLfiQWPwIWBF7g28dMoc/sYqEwiDYB Ux7Km16jfvlHC9aAf5G7XcEFZCiDpLod8qS6iC6GDlp2BGKLHNTDxtv45creEMTNXhDM LIeg== X-Gm-Message-State: AOAM531G296vTvdCg1XXQLmZefo/31tdTNK23TQRMQ/a86QMSCy1B8jK RXSRZiiApSca4lzTkFANEzC/QgQtAxs1mg== X-Google-Smtp-Source: ABdhPJzesxOYMl66zo52aD8miREFQ6aAuidTgTDDtc3UXIdNbsc6+zkiOOC49E8z5SIswrq4PQK6Qw== X-Received: by 2002:adf:a109:0:b0:1ed:c2bd:8a57 with SMTP id o9-20020adfa109000000b001edc2bd8a57mr16755887wro.612.1646083269831; Mon, 28 Feb 2022 13:21:09 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b0037bd5fabd10sm640195wmq.48.2022.02.28.13.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:09 -0800 (PST) From: luca.boccassi@gmail.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'kni: add missing C++ guards' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:05 +0000 Message-Id: <20220228212047.3341966-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/581dea537e997e3afdcd4273fb9f5566055d1c4d Thanks. Luca Boccassi --- >From 581dea537e997e3afdcd4273fb9f5566055d1c4d 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_kni/rte_kni_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_kni/rte_kni_common.h b/lib/librte_kni/rte_kni_common.h index b547ea5501..8d3ee0fa4f 100644 --- a/lib/librte_kni/rte_kni_common.h +++ b/lib/librte_kni/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 @@ -136,4 +140,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:54.717586098 +0000 +++ 0009-kni-add-missing-C-guards.patch 2022-02-28 21:17:53.812928618 +0000 @@ -1 +1 @@ -From e90df35c7a0328f7ad5bfc4d2d9968ff774d7f77 Mon Sep 17 00:00:00 2001 +From 581dea537e997e3afdcd4273fb9f5566055d1c4d 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_kni/rte_kni_common.h | 8 ++++++++ @@ -19 +20 @@ -diff --git a/lib/kni/rte_kni_common.h b/lib/kni/rte_kni_common.h +diff --git a/lib/librte_kni/rte_kni_common.h b/lib/librte_kni/rte_kni_common.h @@ -21,2 +22,2 @@ ---- a/lib/kni/rte_kni_common.h -+++ b/lib/kni/rte_kni_common.h +--- a/lib/librte_kni/rte_kni_common.h ++++ b/lib/librte_kni/rte_kni_common.h