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 DEC50A0524 for ; Fri, 5 Feb 2021 12:20:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8F071606C5; Fri, 5 Feb 2021 12:20:39 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 214311606C3 for ; Fri, 5 Feb 2021 12:20:38 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id j21so2907603wmj.0 for ; Fri, 05 Feb 2021 03:20:38 -0800 (PST) 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=kqxytMjCF3rCiD+qrxtD/orPYGpGUTn2Gehn9AKIVBo=; b=UKGjFD7kjb0x8D3OpCVhJOk2lW9BSowmcuAzq9jRxiEeLM0smYnB2jk8am72EYDh9j fBw8qed8mmFy4OV0Z2/6bZiM7VocTJ2MD9j7EfnCCzNjkNHy8PdlT7SCDs5rmt18EaKM ZtRtfYwWKlOcfQ5Bd2enQYle20SvkPh+c7FS0hbQzdoCSaDQi3yVNi8sZfRyNPglJs1B g/lTBoSpfhC7h+Uxw8MXyjJKJ/w7bQoQMe+vZFhDLoktq0ue1Ia63pYIL9ZDprC2x0aY jOjy/4xkjaqLY2ePKwdMIxHpFlpc8ZTNb2Ikglfz0JLlkFMzVDHH0KZ8oQ6D95USJR7T +IuA== 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=kqxytMjCF3rCiD+qrxtD/orPYGpGUTn2Gehn9AKIVBo=; b=njZ600zxgqNiab17HypCCoy3CiaOFyM3yVRbJbwFlYaQYaSkHRC5zTvz+zFGjZGz25 HAWp/4BXmWcZuDEpWInl5QtvDnB8CXxDp20LuZUewiEnsCM8aBwN+e72mN3YgkqVJVBH /dWQj65eW3Xe8D531ymABfPchFa8NrVseSwZLq5ULfoS1oLT2Fs2AfPgVXthG1JDj7xC ebco9S3nrXHNchPLoIgcpv4PPLOSkru6/fJGlCQP6cwyedMc+NwL7hZcDA7xO3+RGmWj eZDKLa0Zr4ckACMsSl6K/N43XduN0QkWJ/pbI2aKBdYA7HcfhWcUMjSgLehanpzXUTye aBsw== X-Gm-Message-State: AOAM531M7l5bYhTu8eFnGr9AN7wYEGTnmhbvYAckEKiD/eZHHUjOUP9Y kFEGhCTGeuz8qe4mcyKRGQY= X-Google-Smtp-Source: ABdhPJxfeQenq7gam6fO9bteT25YX3XbbM8kJr0ym9SuqYFnmsEFaEIvt83LuEM/MBESH42ilL8zZw== X-Received: by 2002:a1c:f212:: with SMTP id s18mr3167566wmc.107.1612524037922; Fri, 05 Feb 2021 03:20:37 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x13sm3382263wmc.27.2021.02.05.03.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:20:37 -0800 (PST) From: luca.boccassi@gmail.com To: Ashish Sadanandan Cc: Olivier Matz , dpdk stable Date: Fri, 5 Feb 2021 11:15:09 +0000 Message-Id: <20210205111920.1272063-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mbuf: add C++ include guard for dynamic fields header' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 02/07/21. 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/81a66f317a38969933d026d8833fdae596b8c8ea Thanks. Luca Boccassi --- >From 81a66f317a38969933d026d8833fdae596b8c8ea Mon Sep 17 00:00:00 2001 From: Ashish Sadanandan Date: Wed, 6 Jan 2021 18:31:14 -0700 Subject: [PATCH] mbuf: add C++ include guard for dynamic fields header [ upstream commit 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed ] The header was missing the extern "C" directive which causes name mangling of functions by C++ compilers, leading to linker errors complaining of undefined references to these functions. Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags") Signed-off-by: Ashish Sadanandan Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf_dyn.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf_dyn.h b/lib/librte_mbuf/rte_mbuf_dyn.h index d88e7bacc5..fc4eee71d0 100644 --- a/lib/librte_mbuf/rte_mbuf_dyn.h +++ b/lib/librte_mbuf/rte_mbuf_dyn.h @@ -67,6 +67,11 @@ */ #include + +#ifdef __cplusplus +extern "C" { +#endif + /** * Maximum length of the dynamic field or flag string. */ @@ -326,4 +331,8 @@ int rte_mbuf_dyn_rx_timestamp_register(int *field_offset, uint64_t *rx_flag); __rte_experimental int rte_mbuf_dyn_tx_timestamp_register(int *field_offset, uint64_t *tx_flag); +#ifdef __cplusplus +} #endif + +#endif /* _RTE_MBUF_DYN_H_ */ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:30.337504401 +0000 +++ 0023-mbuf-add-C-include-guard-for-dynamic-fields-header.patch 2021-02-05 11:18:28.606687304 +0000 @@ -1 +1 @@ -From 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed Mon Sep 17 00:00:00 2001 +From 81a66f317a38969933d026d8833fdae596b8c8ea Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 397fb6a8d96cf06fc83bd87cadf46d2226fc42ed ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org