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 6436AA0093 for ; Tue, 19 May 2020 15:00:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CDBD1D621; Tue, 19 May 2020 15:00:09 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by dpdk.org (Postfix) with ESMTP id 27AC11C239 for ; Tue, 19 May 2020 15:00:08 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id w64so3436614wmg.4 for ; Tue, 19 May 2020 06:00:08 -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=eoVMEHVmN8WmRDuKdemTrjk9hY3zSAK6u7b6CWHjz0I=; b=ZgJpqk6ivSensjAPMxCSYhKdyQvgAMbz4NkVrwLZly1Kd84q8A1iSKz0V0n8gwZ6D+ BCaAu+puhxs13zmV5pT+PjtDuTwQpssbvxd/n7R4SS/mHeKhtNlKX8onRIYfzTYrGoW7 s2NZmiE1PmJ7Whx6+ZsNNlsg96HJ1Dl4U5Y0EDR0l9Ntw4Dof6M58GVtZk0jfo/iPj4H 6yoLsQ3tb7agh+yHMRqq96RqO10xm7kQEO1KTXDJnR+1B9cjX5CdFB/m8jxXhxr1urhM NFMb6oZRA5BgvJ2IalbvkzY/RTlErj75C6Z15nFf7e904baaaDUa9g1NPV346qvAtkmv czow== 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=eoVMEHVmN8WmRDuKdemTrjk9hY3zSAK6u7b6CWHjz0I=; b=TzuVOaVfhDhExn7+Nm6Y1NrpPKphCbK+7zpSX4xvAcls5owO2jKPcYHFQd1vkEj2bH VqE0lndDOcX0qee80kLezbfsQDRPXL29JF/ArHtBdcwS4ohXtLLIUDS1f4axizjZ9t88 /l542061txGDeu3BW1Hmls8YevfjmxW6NzsTRot2xTVuRFYJy9J5eajZaF/M5lw+2j/Z fIb6Epx7tnR+gTygYXiUFHFCdrzbHL2/mDGwUGpGDMVdWSBGE/2zelilh/1vWXb5Er2N 5mPnR36C5X6JlT4+YFJfRRWlZ/qjzAjPjWGpr+uvMxva7yuc8fU5QPqWDuhmXesH2T87 PRcA== X-Gm-Message-State: AOAM531RjozT/VY6AEJIOPR/Yra5uSp4UZ5p763fbOd7+f14p7tWOGH4 w/VAQgt7oEeXh/+zQOzauMs= X-Google-Smtp-Source: ABdhPJxOFZPjcDw3EhY89VMe1bpBHiMwT4zkwLJgienlrew9fG07HsUeYyd4b3MbH53CJ9hOKuUYfQ== X-Received: by 2002:a1c:4b02:: with SMTP id y2mr5177729wma.115.1589893207851; Tue, 19 May 2020 06:00:07 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w13sm20255131wrm.28.2020.05.19.06.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:00:07 -0700 (PDT) From: luca.boccassi@gmail.com To: Asim Jamshed Cc: Saikrishna Edupuganti , David Marchand , Vladimir Medvedkin , dpdk stable Date: Tue, 19 May 2020 13:54:09 +0100 Message-Id: <20200519125804.104349-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'fib: fix headers for C++ support' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 ca31f0aee2c7c43985b9c242852f50a6b9728e0d Mon Sep 17 00:00:00 2001 From: Asim Jamshed Date: Mon, 16 Mar 2020 18:42:36 +0000 Subject: [PATCH] fib: fix headers for C++ support [ upstream commit 44415a62e6c64af014d935f13e099b17b4ad4893 ] This patch allows C++ programs to use librte_fib library routines. Previously C++ programs were not able to link this library and programs would fail to get linked. With this patch compilation and linking will be successful. Fixes: 39e927248416 ("fib: add FIB library") Fixes: 40d41a8a7b34 ("fib: support IPv6") Signed-off-by: Asim Jamshed Signed-off-by: Saikrishna Edupuganti Reviewed-by: David Marchand Acked-by: Vladimir Medvedkin --- lib/librte_fib/rte_fib.h | 8 ++++++++ lib/librte_fib/rte_fib6.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/lib/librte_fib/rte_fib.h b/lib/librte_fib/rte_fib.h index d06c5ef55a..af3bbf07ee 100644 --- a/lib/librte_fib/rte_fib.h +++ b/lib/librte_fib/rte_fib.h @@ -14,6 +14,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + struct rte_fib; struct rte_rib; @@ -185,4 +189,8 @@ __rte_experimental struct rte_rib * rte_fib_get_rib(struct rte_fib *fib); +#ifdef __cplusplus +} +#endif + #endif /* _RTE_FIB_H_ */ diff --git a/lib/librte_fib/rte_fib6.h b/lib/librte_fib/rte_fib6.h index 4268704038..66c71c84c9 100644 --- a/lib/librte_fib/rte_fib6.h +++ b/lib/librte_fib/rte_fib6.h @@ -14,6 +14,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + #define RTE_FIB6_IPV6_ADDR_SIZE 16 /** Maximum depth value possible for IPv6 FIB. */ #define RTE_FIB6_MAXDEPTH 128 @@ -190,4 +194,8 @@ __rte_experimental struct rte_rib6 * rte_fib6_get_rib(struct rte_fib6 *fib); +#ifdef __cplusplus +} +#endif + #endif /* _RTE_FIB6_H_ */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:21.236608241 +0100 +++ 0059-fib-fix-headers-for-C-support.patch 2020-05-19 13:56:18.287503043 +0100 @@ -1,8 +1,10 @@ -From 44415a62e6c64af014d935f13e099b17b4ad4893 Mon Sep 17 00:00:00 2001 +From ca31f0aee2c7c43985b9c242852f50a6b9728e0d Mon Sep 17 00:00:00 2001 From: Asim Jamshed Date: Mon, 16 Mar 2020 18:42:36 +0000 Subject: [PATCH] fib: fix headers for C++ support +[ upstream commit 44415a62e6c64af014d935f13e099b17b4ad4893 ] + This patch allows C++ programs to use librte_fib library routines. Previously C++ programs were not able to link this library and programs would fail to get linked. With this patch compilation and linking @@ -10,7 +12,6 @@ Fixes: 39e927248416 ("fib: add FIB library") Fixes: 40d41a8a7b34 ("fib: support IPv6") -Cc: stable@dpdk.org Signed-off-by: Asim Jamshed Signed-off-by: Saikrishna Edupuganti