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 A0278A04DB for ; Tue, 17 Nov 2020 12:15:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 978A5567C; Tue, 17 Nov 2020 12:15:23 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by dpdk.org (Postfix) with ESMTP id A5D4DC8B0 for ; Tue, 17 Nov 2020 12:15:20 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id a65so2864007wme.1 for ; Tue, 17 Nov 2020 03:15:20 -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=vAPagUabrSLY8lM3psxqnhxpn8LKISde8RzPEUC5J4Q=; b=jvBrNwPN2HFD093DxBa1GFIY7Y2jlfGRNmTWOwsZyyDRd5cbeJ8piULAipSKyFgSo7 mw/9SuO3WSXORrs/GOTRVS6iAq++Yp4rmIsB7CJvg3DDi4PZHW4IivpUNlkWGaojd8Cd Pxgi243FoFOgrobz8U/i/o8YIPi/+0GCqvHL32G6+77tAKmhemQqnXZ6wgKJWMR5zNuW +rvawvqhpQ5OCVSJpZ73o0bU0/tuz/UzzzOG91qRtXpIUKgub924TVbGczj4ST+wCx32 JdX1Ugxw/ct+gxKoeKqashQX6MKrOGCWYaOgb2+Ep8zUjJ9N8odJsAmhIdiSnEYynvfZ aiFw== 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=vAPagUabrSLY8lM3psxqnhxpn8LKISde8RzPEUC5J4Q=; b=BCDrdrKwCRu6Xr69bPluxLTL8cODFOiZTV9bGLKxzqlfL2BeFTiJ9QtraF8eCa9npQ Ua5EUbhRKLTLnLrMqEpKxqkbWOVnOm/kLHAWsy4/jTdPDMqsfmL7FGX3/erGcboDCj9p ZC8ZvcNW5Wn4ATHjFj15iTlH2MsDTTTfx1+Q+0U6RqaCHB9aI+EbsGsZOr2a9VmJLCyu /V9ero7jEhh5fJYZXQeI2SENETFi+9HW0b3HsNe+yk8rQMjcYTJpwln+FsJmisQAq161 UWBHEY3a7LbqYhyVJaHuL64d13WSyKG1l5yoRn6MkDDrnX6GyhdxOZ7LUA1e5r7i4fAq 08+g== X-Gm-Message-State: AOAM530bKFRhRhepwbhPbK7M4zQIt526ENEOnI+Mjo1RTkAnaXvWuGPo pZOo6Ez0H5KVfaYqXWEsaX4v0FepwNWtmmIQ X-Google-Smtp-Source: ABdhPJzshgGT6nTNDpUhjJNC0uGaejYbqyIBDbMgo6wlrs6AyowLngSaRzJWkhPiWKTZ04Ibf7ZkCg== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr3739516wmf.96.1605611719451; Tue, 17 Nov 2020 03:15:19 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b8sm29094856wrv.57.2020.11.17.03.15.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:18 -0800 (PST) From: luca.boccassi@gmail.com To: Prateek Agarwal Cc: Qi Zhang , dpdk stable Date: Tue, 17 Nov 2020 11:13:54 +0000 Message-Id: <20201117111416.1961049-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: add C++ include guard' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/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. 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/0c3a01ce6e06486ca3a7498da04f9be4ca78da64 Thanks. Luca Boccassi --- >From 0c3a01ce6e06486ca3a7498da04f9be4ca78da64 Mon Sep 17 00:00:00 2001 From: Prateek Agarwal Date: Sat, 7 Nov 2020 14:30:38 +0530 Subject: [PATCH] net/i40e: add C++ include guard [ upstream commit 876589e07ed3ce36b6390ebf41615a8a74557cca ] Add extern "C" in rte_pmd_i40e.h when be compiled with CPP. Fixes: 17e906a1ea9c ("net/i40e: support link status notification") Signed-off-by: Prateek Agarwal Acked-by: Qi Zhang --- drivers/net/i40e/rte_pmd_i40e.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h index 4920f701d3..9929171541 100644 --- a/drivers/net/i40e/rte_pmd_i40e.h +++ b/drivers/net/i40e/rte_pmd_i40e.h @@ -14,6 +14,10 @@ * */ +#ifdef __cplusplus +extern "C" { +#endif + #include #include #include @@ -1081,4 +1085,8 @@ __rte_experimental int rte_pmd_i40e_set_switch_dev(uint16_t port_id, struct rte_eth_dev *switch_dev); +#ifdef __cplusplus +} +#endif + #endif /* _PMD_I40E_H_ */ -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.822573725 +0000 +++ 0020-net-i40e-add-C-include-guard.patch 2020-11-17 11:13:12.901116206 +0000 @@ -1 +1 @@ -From 876589e07ed3ce36b6390ebf41615a8a74557cca Mon Sep 17 00:00:00 2001 +From 0c3a01ce6e06486ca3a7498da04f9be4ca78da64 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 876589e07ed3ce36b6390ebf41615a8a74557cca ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index fc3560c28c..4cb21c3713 100644 +index 4920f701d3..9929171541 100644 @@ -32 +33 @@ -@@ -1130,4 +1134,8 @@ __rte_experimental +@@ -1081,4 +1085,8 @@ __rte_experimental