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 C19E2A04B1 for ; Mon, 23 Nov 2020 18:13:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B8B90C8FA; Mon, 23 Nov 2020 18:13:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 9A4D0A3 for ; Mon, 23 Nov 2020 18:13:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+e/9pP6TRsm2qy21YQpAITi3AeVAR7d73XeuSEV0lvc=; b=HCwMlJelDzxLbZtQ1N6f8U0sbY0AvYSXd7KCF4guEw3gpgm93FcmrWBXWzzvv6ZH8R5vou MmHPMnYEq22jy1iT84HHa4dQjKPEis6OzBp5cMN6Wo7Us4IGZydBhVTt/mprDKjrp7GFjx iuEWsAchCrIlw3Yn7Bx8zAZIMtjtU98= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-560-g47SsqlROCSADGCNG73Gag-1; Mon, 23 Nov 2020 12:12:58 -0500 X-MC-Unique: g47SsqlROCSADGCNG73Gag-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32D29100A641; Mon, 23 Nov 2020 17:12:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42E1F60C43; Mon, 23 Nov 2020 17:12:55 +0000 (UTC) From: Kevin Traynor To: Prateek Agarwal Cc: Qi Zhang , dpdk stable Date: Mon, 23 Nov 2020 17:12:01 +0000 Message-Id: <20201123171222.79398-9-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/i40e: add C++ include guard' has been queued to LTS release 18.11.11 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 LTS release 18.11.11 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/27/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 Thanks. Kevin. --- >From 8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 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 1ef1624236..bbef1e30a8 100644 --- a/drivers/net/i40e/rte_pmd_i40e.h +++ b/drivers/net/i40e/rte_pmd_i40e.h @@ -15,4 +15,8 @@ */ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -1064,3 +1068,7 @@ rte_pmd_i40e_inset_field_clear(uint64_t *inset, uint8_t field_idx) } +#ifdef __cplusplus +} +#endif + #endif /* _PMD_I40E_H_ */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.209073658 +0000 +++ 0009-net-i40e-add-C-include-guard.patch 2020-11-23 17:10:13.975061564 +0000 @@ -1 +1 @@ -From 876589e07ed3ce36b6390ebf41615a8a74557cca Mon Sep 17 00:00:00 2001 +From 8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 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 1ef1624236..bbef1e30a8 100644 @@ -30,2 +31,2 @@ -@@ -1131,3 +1135,7 @@ int - rte_pmd_i40e_set_switch_dev(uint16_t port_id, struct rte_eth_dev *switch_dev); +@@ -1064,3 +1068,7 @@ rte_pmd_i40e_inset_field_clear(uint64_t *inset, uint8_t field_idx) + }