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 951634319F for ; Thu, 19 Oct 2023 01:59:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E94A4069F; Thu, 19 Oct 2023 01:59:41 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 11BD0402BA for ; Thu, 19 Oct 2023 01:59:40 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-32003aae100so118631f8f.0 for ; Wed, 18 Oct 2023 16:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673580; x=1698278380; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LSAoo6p6cRRznFa7kxK97/8vRXB3V/s0iGP4iM/UBdw=; b=RnJmI4G9ukJPFjHn3jjLeHdTwM3VIe9F9GJCGD712w1/p1mRHHabruispDuOIWMjCQ 4Pnkbe9OGNzd/VJqGE36mqaMcrXTc2zKS0RQqrixwcj5kwgf7RKNDtVxOtf5bx27TrWQ 3ASZ7/boxUX68+aFYwF5DJCROeRivVsUkNvxZf9TjToZEPfp188bgQeFbrGoLi5hG1bT OUYYmkS8tJ9Wz41QJFrC0JeiZUQQBu5XVfxx+ctDySr7UGKjczT7tNtCV88TEtcHojUf f7tp7t5Hu+Qz2kbVfYMmGdMKTxbyupMV7gJYQAiOWkotJGK+Rf8C6NAeo4MTmOECH/pP C8NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673580; x=1698278380; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LSAoo6p6cRRznFa7kxK97/8vRXB3V/s0iGP4iM/UBdw=; b=Nt+HdXzx2+DgqMfA/OjutoEhHHDBFevzXx/Kdt2yYUrsZatxEO6ZBUCeIrpo04G2pj QHX0u4hqC2N3noXrCfXVIV/giyCFZ0aa2hxIOyTjKczROtCWVmorzRBRMBJdvpOpZ7mm IKvdt75UzETJ9T/BQvoNLSckmFe5Rm3I9KAZF8CvsfWyjAxSSrO3rYFuj9JwZ46E76ny k41ipG3PQ+m1pAou1jguYuXLUYcbhcd5PdHHZvWV3Gb9O1bbIIIbxzyJOk778CR75FN7 nQ52crZZnpADciW26AaF+CepCQZpfaZ8hykTnVAyC3j1P1oXJSi5DAwXwkhUqs3XWw3s lcSQ== X-Gm-Message-State: AOJu0YwOVfjZT1gNrZqtNI4htxy9WVD8GcdPDWybzmq+CqWmDbdZ6yHZ XxcOMUWqw8L8LdloHEFeonYWt7q/xum+Dw== X-Google-Smtp-Source: AGHT+IFRjjnRy9M3usHxiJWa1jbCc4h4S7hXtIape7Nnd6yczPdRt+HGF5+1XSlEjNs4CMkcrwwlbg== X-Received: by 2002:a5d:6586:0:b0:31d:caae:982d with SMTP id q6-20020a5d6586000000b0031dcaae982dmr219682wru.12.1697673579702; Wed, 18 Oct 2023 16:59:39 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id b3-20020adff243000000b003258934a4bcsm3152901wrp.42.2023.10.18.16.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 16:59:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Visa Hankala Cc: Tyler Retzlaff , Ferruh Yigit , dpdk stable Subject: patch 'net/bonding: fix header for C++' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:58:52 +0100 Message-Id: <20231018235930.3144-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/998744451b91559b7784abbd9f1a8fa498a60fb8 Thanks. Luca Boccassi --- >From 998744451b91559b7784abbd9f1a8fa498a60fb8 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 @@ -197,10 +197,6 @@ int 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. * @@ -331,4 +327,9 @@ rte_eth_bond_8023ad_agg_selection_get(uint16_t port_id); 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:56.430860623 +0100 +++ 0003-net-bonding-fix-header-for-C.patch 2023-10-19 00:28:56.173803358 +0100 @@ -1 +1 @@ -From 25fac202f4e00dd1be4eef794174b689a5f64d54 Mon Sep 17 00:00:00 2001 +From 998744451b91559b7784abbd9f1a8fa498a60fb8 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