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 CB0F842D46 for ; Sun, 25 Jun 2023 08:41:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5B4240ED8; Sun, 25 Jun 2023 08:41:32 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2086.outbound.protection.outlook.com [40.107.92.86]) by mails.dpdk.org (Postfix) with ESMTP id 5E6D640A7F for ; Sun, 25 Jun 2023 08:41:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gv2hGSceJgUWCeWqq9Tsbg9CBQ4wevZL/Zrg/731KzBX+jgFdfK8er6RH98QIajKOY9NTwCr0JawAe6f0P2SsqjKqjGWoKeZL1hUoBv90lO7YUsjxlbhHAVBZTSGQFFMh70d/HQOYE84r7wkBwIQHrEFzaWunSRvSgoKkKGF0U2D+FQ8Qqrxe4492LSVKkbwxfofjC3jnotiS80UefB51mNurERBUC4oR5Pg3uObq9DdOvNmRx7strRlRhnFg0HrkjSsrFGWNuvtpvDl79FTmV9v4JRMGOkViqxBwlv+vack9AkXt3nhpWkFBjFAwYsxWlL+QatRLbiQn/66/p3vtw== 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=fTuh16a1yARhRgJjC17uEmS14kEkelRF/uFE2UVVKbc=; b=IcMlD8w7Mb00FSLP2+0/0/aSxzIl7naz2TgQrvN+nhVNgn0Z2hv+stw4KzhbXWgXQL1DA3IBtj8ADcX34xF2LkGAqWKVeEwLISxl1NjThMN7Eu+vxDZJHa0kL7eGAXQDkMl0OdReCtm9btuPDQuF4SwCIDGqxEAau/lciK0iWsh43RlSXg7nJrZoAVIsUhoQR7MONjtXwb1SiXPLG0NG8iAn++FKFgo1SHVhc5KBhmun9zhIMTdJr0wtXQrM4IjdIsCbwIbL+ooFH2k1pKkf/eOonaoHusZe4I3Ld/NajeZ7/APDevF+UhBG0P0UWormbVg+hodr/gi+qe64uOYvjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com 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=fTuh16a1yARhRgJjC17uEmS14kEkelRF/uFE2UVVKbc=; b=N23GVnEaqy5okQddjbpacJqaz20XynzWeyOiiBR7eJEoSTFQk2CgV1CwKMYMI+xOLQ3Q/Z01JC82t/KyilAedv+pjCQqWXYXWUu7m6qAzH6XQPlHriQMTDCJ+WpinvfkJ4rhmLUjvY9s4Ls0AqvnkYu7fhuDtq3p6iqh6FhhpsS2xyk04rfKefkBQhOvhKFs0K9q5TxQ6BBSGNCK58qTwfi/6oesNvfBaT+xTI0v4kqya1R92oGB5/1pIujWYEJbJdcxSXcmUrXisZMiduYR4OnO5+ols6Qpw2Vf//JeDW0+gu1wrkU3CzgzF0wMYzuGyqmNAcewqLb+A34f9h8XfQ== Received: from MW4PR03CA0297.namprd03.prod.outlook.com (2603:10b6:303:b5::32) by IA1PR12MB7615.namprd12.prod.outlook.com (2603:10b6:208:428::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:41:29 +0000 Received: from CO1NAM11FT099.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::e5) by MW4PR03CA0297.outlook.office365.com (2603:10b6:303:b5::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:41:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT099.mail.protection.outlook.com (10.13.175.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.46 via Frontend Transport; Sun, 25 Jun 2023 06:41:28 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:41:15 -0700 Received: from nvidia.com (10.126.230.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.37; Sat, 24 Jun 2023 23:41:13 -0700 From: Xueming Li To: Qin Ke CC: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix disabling promiscuous mode' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:38 +0800 Message-ID: <20230625063544.11183-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT099:EE_|IA1PR12MB7615:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c08263c-5d92-40f9-2c91-08db75473491 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fuTirqyWoR5ceYFKoJwzGCh4ylhyS6yjpX3jdXO41xJ4PwVZeLV40oz8xk3ixCg/1oKAZuT2fANviU2+OeTV9dDq59oFUunSTGb8xw7UsldP4DVa88Z1rrreC6reF/k3jGgv10cqERO5sCmkjgES/25P+30bzupxNT261RucL3pKvaLGpHw99z8hI/K2U2H169Wo1hodVh5tCEnx2CT30e0mKsMwcV3l85OZVefGAKODAoLEeEMKZAK3bvhI9EN50TrqmwvvhDTEmOB+3kI7GejYPwvLYaWo+8ikMDDCsDo8RSNnvEz6K2IvHTQ0okDxBtbE9B9+VXYLQWiCC4bh3v71Gp1D+/yl+51ZO/AA229DyoXvz0lOmMdJCukmcw97B/IMEp3wJLXr6w5XIznyfW+SIH9pYt5mxmn5nlgOrUbZrJHyj4teh2ScuPFaRfN3J73ALFnUOUOigAvHzGs3cpdWpTeODkclzkr3aUhIaUOpU+Ap2KM/Uede2z/wXI7wsP0UfQAftyTZzc3WzGboXU4GHh5HFX2zE0zA1j4hHlRhQOs4GG0ednfuoGp78ricNiQpYvccr+U1EsQ+VwPUw/bOF9YyS0Ry4gIx1WWW4oeQCGH/8Rr5i1WxEO9ULSz2rc0JXmZH85cYuk7vyF+C2pVIgcqp49mBtGdOqayU1xgGMbD87MEIi2cr3aqg8B8rEsSBrgwyLn1JYLs3mms8K9Gk+/p+t1zaB25CFpweJEnoIljhHFNvyUsyU6D7ZBQ9lFyuiL6uajlMPwPj55mRGQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(66574015)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(40480700001)(41300700001)(54906003)(86362001)(478600001)(316002)(36756003)(70586007)(70206006)(4326008)(6916009)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:28.7020 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c08263c-5d92-40f9-2c91-08db75473491 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT099.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7615 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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=aae5fcb267154d7ba01eabcdf22f3f02aad2fa06 Thanks. Xueming Li --- >From aae5fcb267154d7ba01eabcdf22f3f02aad2fa06 Mon Sep 17 00:00:00 2001 From: Qin Ke Date: Thu, 8 Jun 2023 11:07:56 +0800 Subject: [PATCH] net/nfp: fix disabling promiscuous mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit d318e11099bb992c47d22c0c3d13f55dc868c3a2 ] The callback function of promiscuous_disable in nfp_flower_pf_repr_dev_ops and nfp_flower_repr_dev_ops should be nfp_net_promisc_disable, not nfp_net_promisc_enable, fix it. Fixes: 39d82d209805 ("net/nfp: fix promiscuous mode for representor port") Signed-off-by: Qin Ke Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower_representor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 5809c838b3..c77495f348 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -528,7 +528,7 @@ static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { .stats_reset = nfp_flower_repr_stats_reset, .promiscuous_enable = nfp_net_promisc_enable, - .promiscuous_disable = nfp_net_promisc_enable, + .promiscuous_disable = nfp_net_promisc_disable, .mac_addr_set = nfp_flower_repr_mac_addr_set, }; @@ -549,7 +549,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { .stats_reset = nfp_flower_repr_stats_reset, .promiscuous_enable = nfp_net_promisc_enable, - .promiscuous_disable = nfp_net_promisc_enable, + .promiscuous_disable = nfp_net_promisc_disable, .mac_addr_set = nfp_flower_repr_mac_addr_set, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.132564500 +0800 +++ 0060-net-nfp-fix-disabling-promiscuous-mode.patch 2023-06-25 14:31:58.405773900 +0800 @@ -1 +1 @@ -From d318e11099bb992c47d22c0c3d13f55dc868c3a2 Mon Sep 17 00:00:00 2001 +From aae5fcb267154d7ba01eabcdf22f3f02aad2fa06 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit d318e11099bb992c47d22c0c3d13f55dc868c3a2 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 6b4ba5b9a2..3225a4b84a 100644 +index 5809c838b3..c77495f348 100644 @@ -27 +29 @@ -@@ -518,7 +518,7 @@ static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { +@@ -528,7 +528,7 @@ static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { @@ -35,2 +37,2 @@ - .fw_version_get = nfp_repr_firmware_version_get, -@@ -540,7 +540,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { + }; +@@ -549,7 +549,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { @@ -44 +46 @@ - .fw_version_get = nfp_repr_firmware_version_get, +