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 E3FFE4326F for ; Thu, 2 Nov 2023 14:13:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD7D5410E3; Thu, 2 Nov 2023 14:13:23 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2F379410E6 for ; Thu, 2 Nov 2023 14:13:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930801; 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=TXoanU8aKGlYQr6RVaKXgu/zmS469LC6npe/fT9OT/o=; b=aLLeetdXR3fjR9aU8GQTBLQJHFL1q0T9GRkvXctduW223oG1tHdpJ5H3wJMxuvwSLIl35i lOb+XIFOMPWckwJPHlN4mzG4Wtx3S6xaA5dt+mO/E1Wwbb6beKqpCnm+qei/PyBR4GTDV8 DUJ9lTJWZlrp4HbztXJXrkxq4p8Pmbk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-394-nz32Z3H9N1-FRhmcZVg5bA-1; Thu, 02 Nov 2023 09:13:18 -0400 X-MC-Unique: nz32Z3H9N1-FRhmcZVg5bA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2BB95811E88; Thu, 2 Nov 2023 13:13:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24407492BFA; Thu, 2 Nov 2023 13:13:16 +0000 (UTC) From: Kevin Traynor To: Visa Hankala Cc: Tyler Retzlaff , Ferruh Yigit , dpdk stable Subject: patch 'net/bonding: fix header for C++' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:10 +0000 Message-ID: <20231102131254.315947-4-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.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/08/23. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/41073f2809c8ad0648689fe698fdc80523da0850 Thanks. Kevin --- >From 41073f2809c8ad0648689fe698fdc80523da0850 Mon Sep 17 00:00:00 2001 From: Visa Hankala Date: Wed, 9 Aug 2023 15:52:41 +0000 Subject: [PATCH] net/bonding: fix header for C++ [ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ] Apply C linkage to the whole header to allow use with C++. Fixes: dc40f17a36bc ("net/bonding: allow external state machine in mode 4") Signed-off-by: Visa Hankala Acked-by: Tyler Retzlaff Acked-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_8023ad.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h index 7eb392f8c8..025bd0ec54 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad.h @@ -198,8 +198,4 @@ rte_eth_bond_8023ad_slave_info(uint16_t port_id, uint16_t slave_id, struct rte_eth_bond_8023ad_slave_info *conf); -#ifdef __cplusplus -} -#endif - /** * Configure a slave port to start collecting. @@ -332,3 +328,8 @@ int rte_eth_bond_8023ad_agg_selection_set(uint16_t port_id, enum rte_bond_8023ad_agg_selection agg_selection); + +#ifdef __cplusplus +} +#endif + #endif /* RTE_ETH_BOND_8023AD_H_ */ -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.011100356 +0000 +++ 0004-net-bonding-fix-header-for-C.patch 2023-11-02 13:09:40.765163181 +0000 @@ -1 +1 @@ -From 25fac202f4e00dd1be4eef794174b689a5f64d54 Mon Sep 17 00:00:00 2001 +From 41073f2809c8ad0648689fe698fdc80523da0850 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 7ad8d6d00b..921b4446b7 100644 +index 7eb392f8c8..025bd0ec54 100644