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 8E204A0518 for ; Fri, 24 Jul 2020 14:06:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 855851C11C; Fri, 24 Jul 2020 14:06:39 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id 027E91C127 for ; Fri, 24 Jul 2020 14:06:37 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id k20so397866wmi.5 for ; Fri, 24 Jul 2020 05:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kpyao45xe/DUKRRWFXpx328FeRUqkyCsteTKGdQTqSw=; b=YDTwAxbEdy0K70c3VshGI8BCaA7SNOxAZa6umAcf2Xqb70eAV5VsEWaFOzjG+v+r3M 9Ovu7GoC/1lks7CjMJ6rIfPVu7IjfCfFHPW59GIefdFYI4FtQR6c/MU0k3c7Hb8NhlgQ wNKXV9muIchOVwgm8B9chiSYvICFKTOsOHe8g6P0vKSqpGxpQO7C901htqnGBBKg7YAD DrKyBdjlx4FLLXpqzLsr/Q6O1H6v3jxzY2NRCU6iauO3uZ5h+10xalUqmY2jcJNcpzBn qGAkqyQEzb6niGFW6mIDLcsyceaNYEsnmpwpdnabcht9u/YgIYAdrMfv9PdIzP1zIr7d TVGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kpyao45xe/DUKRRWFXpx328FeRUqkyCsteTKGdQTqSw=; b=oILJhi4VpQD1U1nSa2Rf/IfESMi2cGJoWbWJ75Yxv31jlquW4OeFY+AncWfip4Oeb+ Ba1caGel4v64DOWR8XUE1Dzz2ln2WJSoEBcCK96lklirk/Bts7E5YQlhBSHpDQNJDmbV l4aD9UnPpMrOG7vpAoCb9u/qxtVN6vzRZn6SNDE5cL3NVLLgJFUWoEiLkvYsbXIDfpuB tt5izuUIsvaU2c0RJVjjnNDqg2NxaidrOiZ1UYnO+UWic0e+tPZujBTqESkO5YOlFgAS bD5q3xJtJu2sAtB4RpupSwddlqdmsq52+Tyi3gj03pR9ravRR7ZToqIwDQEd/l3CAhVx 5aKA== X-Gm-Message-State: AOAM530lB0aAigS1xVGRc+Ws4igduJzUsJUSdMoC2PZyO/1fABx+rrIh xc7GVsrHD0O3f/yi+r0Bygo= X-Google-Smtp-Source: ABdhPJyVckk/9w0/Zy9OWG9GBvhWGqi4RxJmjTdZ+iIhUBEoX1jJGTIAlyvqAbr+ppeCSzuQi84x6Q== X-Received: by 2002:a1c:4343:: with SMTP id q64mr8422741wma.20.1595592396744; Fri, 24 Jul 2020 05:06:36 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t3sm1272897wre.41.2020.07.24.05.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:06:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Vladimir Medvedkin , dpdk stable Date: Fri, 24 Jul 2020 12:58:48 +0100 Message-Id: <20200724120030.1863487-90-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'rib: add C++ include guard' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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. Thanks. Luca Boccassi --- >From 09cea03334ff8ee569fd49f1eb1ed13069bc24b9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 25 Jun 2020 13:32:08 -0700 Subject: [PATCH] rib: add C++ include guard [ upstream commit b2a0b9f0447a64dd03aa210c49d70572077555ea ] All include files should be safe from C++ Fixes: 5a5793a5ffa2 ("rib: add RIB library") Fixes: f7e861e21c46 ("rib: support IPv6") Signed-off-by: Stephen Hemminger Acked-by: Vladimir Medvedkin --- lib/librte_rib/rte_rib.h | 8 ++++++++ lib/librte_rib/rte_rib6.h | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/librte_rib/rte_rib.h b/lib/librte_rib/rte_rib.h index da558c417..9369661dc 100644 --- a/lib/librte_rib/rte_rib.h +++ b/lib/librte_rib/rte_rib.h @@ -20,6 +20,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + /** * rte_rib_get_nxt() flags */ @@ -281,4 +285,8 @@ __rte_experimental void rte_rib_free(struct rte_rib *rib); +#ifdef __cplusplus +} +#endif + #endif /* _RTE_RIB_H_ */ diff --git a/lib/librte_rib/rte_rib6.h b/lib/librte_rib/rte_rib6.h index 4b284c913..e7560fa8a 100644 --- a/lib/librte_rib/rte_rib6.h +++ b/lib/librte_rib/rte_rib6.h @@ -21,6 +21,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define RTE_RIB6_IPV6_ADDR_SIZE 16 /** @@ -338,4 +342,8 @@ __rte_experimental void rte_rib6_free(struct rte_rib6 *rib); -#endif /* _RTE_RIB_H_ */ +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_RIB6_H_ */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:52.019269650 +0100 +++ 0090-rib-add-C-include-guard.patch 2020-07-24 12:53:48.315006981 +0100 @@ -1,13 +1,14 @@ -From b2a0b9f0447a64dd03aa210c49d70572077555ea Mon Sep 17 00:00:00 2001 +From 09cea03334ff8ee569fd49f1eb1ed13069bc24b9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 25 Jun 2020 13:32:08 -0700 Subject: [PATCH] rib: add C++ include guard +[ upstream commit b2a0b9f0447a64dd03aa210c49d70572077555ea ] + All include files should be safe from C++ Fixes: 5a5793a5ffa2 ("rib: add RIB library") Fixes: f7e861e21c46 ("rib: support IPv6") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Vladimir Medvedkin @@ -17,7 +18,7 @@ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/librte_rib/rte_rib.h b/lib/librte_rib/rte_rib.h -index a9bb42f6f..f80752e5b 100644 +index da558c417..9369661dc 100644 --- a/lib/librte_rib/rte_rib.h +++ b/lib/librte_rib/rte_rib.h @@ -20,6 +20,10 @@ @@ -31,7 +32,7 @@ /** * rte_rib_get_nxt() flags */ -@@ -282,4 +286,8 @@ __rte_experimental +@@ -281,4 +285,8 @@ __rte_experimental void rte_rib_free(struct rte_rib *rib); @@ -41,7 +42,7 @@ + #endif /* _RTE_RIB_H_ */ diff --git a/lib/librte_rib/rte_rib6.h b/lib/librte_rib/rte_rib6.h -index 24faf4632..b5e10569b 100644 +index 4b284c913..e7560fa8a 100644 --- a/lib/librte_rib/rte_rib6.h +++ b/lib/librte_rib/rte_rib6.h @@ -21,6 +21,10 @@ @@ -55,7 +56,7 @@ #define RTE_RIB6_IPV6_ADDR_SIZE 16 /** -@@ -339,4 +343,8 @@ __rte_experimental +@@ -338,4 +342,8 @@ __rte_experimental void rte_rib6_free(struct rte_rib6 *rib);