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 B2D55A0032 for ; Fri, 18 Feb 2022 13:42:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA83740141; Fri, 18 Feb 2022 13:42:02 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 6A01240141 for ; Fri, 18 Feb 2022 13:42:01 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id k41so5181317wms.0 for ; Fri, 18 Feb 2022 04:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1PUm4CVd3irwO3yoZqKmepDNVak0QsLBjflf4lAzyU4=; b=coEuCAWC6N8vCcTGtFjl20zom88idNOlaGYaG83G7sYdn9161kIWcUJ5Q5SEUsALke yv7KRYYXDh4/7P3K1384WmwN8yEyvcLjsibJoqgAWWUbd/2QqBJBWTbRcCDqVur1I4O3 7/vuB10u30xwVlz6FgA5BMe/W+ab3XK5zFxQLLS1Uev3N7LU5ymbLyzXkFgruXYmwTt4 XfhTSjTJuJvAAu75U6tOpsPXzY+y5FjiXd4fuQDSUwxh7e3TT+XNhSx3swaMIjxORxJW mMll87YLTh+HUCATqHfRzP95u5zsyTskO5y9TYSPY1EG4VVsvy8gAAcfMj6m9/Pk8Zfd UXiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1PUm4CVd3irwO3yoZqKmepDNVak0QsLBjflf4lAzyU4=; b=dPFys4wXfAcT34hJkI9dVQ/W/ug+bHPQJsFLZ+OTlxKRaDT0VPZy1mx1wryd1+UyZ2 n7UlAnvstfxw2fpOy/gptyPQZDrpkfAKEtwu7GO6qnEXLgd439ikWcTy6EVI8XVh9vze OIIQIJdm366UcA1d4QbUeBb9QxMbKJdaCxLXMiJ3vfx/fiviSsbLfwvLPJPtH6JyGzh4 2BTm6sDU0Hwg3I7vBQGli+EEbLMf7EeaY+/qFHXesivVD0xRQ2GXM0lwZ17Hr1GZs+o9 2At4bVLoiUTgiXFgo2eNv1PGkAByMtIWV7LYNaOdFKC8+IlnfbjZQezebvY/SytOcUrW Qh0A== X-Gm-Message-State: AOAM532Jtlse9lHv6Nsydeyg56fQFFAUaUIdoiKYsTROea7pB1Nl5ycO Ld3JHivkjb/r8AJIVRJK2K0= X-Google-Smtp-Source: ABdhPJxQIG0/QnfkB/0eEx2wjv4auKrhi1jsGwf5KNYc6gxXug+AB2sIHteS1uQTNbBeIyq0SwO18A== X-Received: by 2002:a05:600c:2c46:b0:37b:c653:37a3 with SMTP id r6-20020a05600c2c4600b0037bc65337a3mr7250077wmg.65.1645188121115; Fri, 18 Feb 2022 04:42:01 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id p8sm34994989wro.106.2022.02.18.04.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:42:00 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.5 Date: Fri, 18 Feb 2022 12:38:15 +0000 Message-Id: <20220218123931.1749595-46-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e977e8ef8e6f381758c3e5859a4709f349c997e3 Thanks. Luca Boccassi --- >From e977e8ef8e6f381758c3e5859a4709f349c997e3 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_net.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index deea3de910..df3b7711dc 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -543,10 +543,6 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) return -EBUSY; } - 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.845350802 +0000 +++ 0046-net-nfp-remove-duplicated-check-when-setting-MAC-add.patch 2022-02-18 12:37:37.662791295 +0000 @@ -1 +1 @@ -From 9e2cf57e2969a7248c1dbfb2e0c6d5c185b8addf Mon Sep 17 00:00:00 2001 +From e977e8ef8e6f381758c3e5859a4709f349c997e3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9e2cf57e2969a7248c1dbfb2e0c6d5c185b8addf ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - drivers/net/nfp/nfp_common.c | 4 ---- + drivers/net/nfp/nfp_net.c | 4 ---- @@ -27,5 +28,5 @@ -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 -@@ -280,10 +280,6 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) +diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c +index deea3de910..df3b7711dc 100644 +--- a/drivers/net/nfp/nfp_net.c ++++ b/drivers/net/nfp/nfp_net.c +@@ -543,10 +543,6 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)