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 8872A431D5 for ; Sun, 22 Oct 2023 16:23:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80662402D9; Sun, 22 Oct 2023 16:23:49 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) by mails.dpdk.org (Postfix) with ESMTP id C4BDF402D0 for ; Sun, 22 Oct 2023 16:23:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsiSZcsG6CksIcEzGhFZ5QsV5d0uftyqbvXVCxS1D8/pXkHcd6BCbzihpYFrFn3DdzN4GWkoDozPdwEOM4LyPBVCChRP2i06dLkpEBU2Lt5mQ85ezBxXXTTgNhQOGp6IzyE0Vx69DyO3rfV+sLxNxuHrRtDhPUsJVf/Odp5IkwGbeZzwUM/Y0Vsggd3eZamcjK2ubPpNpkaZUGrYF1q7+lyY2Gve8XWHQThmNAbqX7o7Hqb97iYFZaW8mp4wE4PtBE8GbwrB1VYo7Sjt60aWe/YV1DBDh+F3B4y0+sizrG7KTQH2r6COY07drIWV7pMSbUM0zhSrel9V2gmkt1lhTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Nv/AT74SxNlOsRP0XpImLT3i83w78PqdEIBjKz0Iotw=; b=GrkJvXaUC3327ovyVawniMWLKHSEi2vxfFUQggeOPeKnu4YlrDEG08AZUpuCQxCUpLPjWcNeksIEnlLkz9LuFljmOdOAIDUiPpAbmMze/t0xboQ4+PWAGuFWGhv7NS77bmkZmuJFI8h7RLdUygN+ObRNaZ63XkJzg1UqsPjYEVZhonJNSgQ6SL7T2uw0BDXoNVlhaA26a4okYeUjOriXLTqg8vfRqyS5hCDBg6lqwwP4ZbD1sxKpdNkRbuP1ZWQI9gdAyPQ0ZZGpibQRyiFp91zcVLnKFkV3256F+jrJ4uq7imF1/2C+CVM0fFUn4aZYN574UriL/Zje1l3gt44vgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=hankala.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Nv/AT74SxNlOsRP0XpImLT3i83w78PqdEIBjKz0Iotw=; b=q88f2xK8YU17WAvC2KJypMTni06rjMx7uywueMCFzV9ywM53U+OaC6XCYsIjjXnuKXgasKDeFPb6zJrZLhfTDj1cDhTd6dkH5ldp1xxq/l+LkoVVoXxhLoBDqqAHtsA34SeT+VrYZ6J0LA/U1LTUT7PpNqr2T9zl4yjsUGP3/eBeTNnlHPg8lzH2t/Kye0Wn4Q9fd+KeP2fEH8L40ovcAOkrcf5cdu9sS7g8Znf70Xj1XOEe1Lgjx+iXoFc4WEjK/OXrYrery8j7LrZKEFIi3HTFa1wMFtrNiRnGHtQdzjBkpufzg6xr/1X4i2Uf32hRr+9Oui0w67xYqla2dERwQg== Received: from BYAPR11CA0069.namprd11.prod.outlook.com (2603:10b6:a03:80::46) by MN0PR12MB6367.namprd12.prod.outlook.com (2603:10b6:208:3d3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24; Sun, 22 Oct 2023 14:23:45 +0000 Received: from CO1PEPF000042A9.namprd03.prod.outlook.com (2603:10b6:a03:80:cafe::52) by BYAPR11CA0069.outlook.office365.com (2603:10b6:a03:80::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:23:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042A9.mail.protection.outlook.com (10.167.243.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:23:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:35 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:33 -0700 From: Xueming Li To: Visa Hankala CC: Tyler Retzlaff , Ferruh Yigit , dpdk stable Subject: patch 'net/bonding: fix header for C++' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:34 +0800 Message-ID: <20231022142250.10324-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A9:EE_|MN0PR12MB6367:EE_ X-MS-Office365-Filtering-Correlation-Id: a34183c1-deb4-4216-f17a-08dbd30a8005 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u1VrTWYwEFJHtVArnGSQ2+k3hXZ2wibVEey6RguBXkdSluJXWqyAQd3e9TjviPaRVnK7jDRWJJqKgSUNWt85mfUhFWL4VKn3XYy6m0znGNulcfa4Y6SeN+6PKVHZBfGNZI4pg9wPPtQsoZ/9bGlHF9jMBX2oc/nE5iyLLlB2la0zmc/kLZQGU7KJvD1CyXE+e98NasR3oDUq9PCvm5mDBeIIgDvV4UvNRiHwAFAobdTZFbr2ItFuP+omtemHiJmEzZ7l/YngBUqhT8EY3dHMh4blJdZyQ3BrgJbBxfiOpPgZGbslcgZqm88FCD29qNfxOjPUs3B/F7J4fuwVZP1yx2pkvhSB0ZByrthZ60kQEkYlBWXgmx53QKxuEOK8nTTn5OXRZ2uVgYECFO+GxYW2fxnrWc5J0RJ1bubAi1h00vWwc40Ik80uL1h3QihUV2TZGs2oaJb6Qt+cXWLl3hfJ515knRm4CPrVgfOQzTjoh/I5YEC0bI3L45Uvj9s/qLAU4NT96GakNYn8VdwDaxAjOwhpQTgL85FROlk3K1sniDSXEHGARTf0+iFL8mcfLgER9Q9p4vV4wBaFpBQdtfAbmlzyAOfXyBMP+eOK7HNkXy+e06KoKUDdUgiiQhCZSKk3/EDT6mM8B/i8FAUF626D6FXDeMYHpNVUCcqlyW3fMcpHJDb4Lp8zBim0lJL3hXbQTCv6M8Vjpi4d4Gng4tm5LLA5QVT/B/jAkYxy72ykfY8Szm60MF8P6Jrbl6WrimNQpHNZx9pDguWldZW8DiWn2pny9bKbuJ+hFCilssxadlI= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(39860400002)(376002)(346002)(396003)(230922051799003)(82310400011)(1800799009)(451199024)(64100799003)(186009)(36840700001)(40470700004)(46966006)(86362001)(4001150100001)(40480700001)(55016003)(40460700003)(70206006)(70586007)(8936002)(54906003)(6916009)(316002)(966005)(478600001)(41300700001)(8676002)(2616005)(36756003)(4326008)(47076005)(26005)(426003)(2906002)(83380400001)(6286002)(36860700001)(356005)(5660300002)(7696005)(53546011)(7636003)(1076003)(16526019)(336012)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:23:45.2501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a34183c1-deb4-4216-f17a-08dbd30a8005 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042A9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6367 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 22.11.4 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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=38b7efe56880d13ebe733d90ec304e8e5266e146 Thanks. Xueming Li --- >From 38b7efe56880d13ebe733d90ec304e8e5266e146 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++ Cc: Xueming Li [ 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:34.659904400 +0800 +++ 0005-net-bonding-fix-header-for-C.patch 2023-10-22 22:17:34.126723700 +0800 @@ -1 +1 @@ -From 25fac202f4e00dd1be4eef794174b689a5f64d54 Mon Sep 17 00:00:00 2001 +From 38b7efe56880d13ebe733d90ec304e8e5266e146 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 7ad8d6d00b..921b4446b7 100644 +index 7eb392f8c8..025bd0ec54 100644