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 46FFFA0350 for ; Mon, 21 Feb 2022 16:39:17 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 421954013F; Mon, 21 Feb 2022 16:39:17 +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 751C04013F for ; Mon, 21 Feb 2022 16:39:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457955; 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=WkJHNOdyKBLTHlUmazMGlqxZ+s6eVaSmHNclSJscdLE=; b=PNucDa/RGjf3m8FMMB6HX/RlfuZBhiumT3PtdYXrMWXNxRwUVy9ezV0sZZ0c/gTKiemII8 l5dJIft+qe8iqUesgWa9O+IPhqas5cwBcvN/RcoDP6HyaxRpxgZ27prgHeRoxSbtecd+By oJHMs/8mr0FX9z4GJk95J9r3tiS8enA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-538-xP35lh60NwOUzQE7_OSBJw-1; Mon, 21 Feb 2022 10:39:11 -0500 X-MC-Unique: xP35lh60NwOUzQE7_OSBJw-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 B959A8143F3; Mon, 21 Feb 2022 15:39:10 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33AE778DDE; Mon, 21 Feb 2022 15:39:05 +0000 (UTC) From: Kevin Traynor To: Maxime Gouin Cc: Olivier Matz , Kevin Traynor , Ferruh Yigit , dpdk stable Subject: patch 'net/nfp: remove duplicated check when setting MAC address' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:29 +0000 Message-Id: <20220221153625.152324-80-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-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" 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. 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/23c2f685984482646e7abead5ea13ba099eec814 Thanks. Kevin --- >From 23c2f685984482646e7abead5ea13ba099eec814 Mon Sep 17 00:00:00 2001 From: Maxime Gouin Date: Wed, 5 Jan 2022 11:32:02 +0100 Subject: [PATCH] net/nfp: remove duplicated check when setting MAC address [ upstream commit 9e2cf57e2969a7248c1dbfb2e0c6d5c185b8addf ] Reported by code analysis tool C++test (version 10.4): > /build/dpdk-20.11/drivers/net/nfp/nfp_net.c > 546 Conditions "(hw->ctrl &NFP_NET_CFG_CTRL_ENABLE) && !! (hw->cap &NFP_NET_CFG_C" is always evaluated to false > 547 Condition "! (hw->cap &NFP_NET_CFG_C" is always evaluated to false The previous "if" checks exactly the same condition. Removal of duplicate code. Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change") Signed-off-by: Maxime Gouin Reviewed-by: Olivier Matz Acked-by: Kevin Traynor Reviewed-by: Ferruh Yigit --- drivers/net/nfp/nfp_common.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index f8978e803a..b26770dbfb 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -281,8 +281,4 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) } - if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && - !(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) - return -EBUSY; - /* Writing new MAC to the specific port BAR address */ nfp_net_write_mac(hw, (uint8_t *)mac_addr); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.378974795 +0000 +++ 0080-net-nfp-remove-duplicated-check-when-setting-MAC-add.patch 2022-02-21 15:22:44.172704308 +0000 @@ -1 +1 @@ -From 9e2cf57e2969a7248c1dbfb2e0c6d5c185b8addf Mon Sep 17 00:00:00 2001 +From 23c2f685984482646e7abead5ea13ba099eec814 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9e2cf57e2969a7248c1dbfb2e0c6d5c185b8addf ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org